diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-01 15:56:01 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-02 16:47:39 +0100 |
| commit | 372dfc8bd40446e04ea22f2752cc99f0566fa077 (patch) | |
| tree | fa0decc793c931e7df91a6938c1bda4977b19c09 /core/java/android/webkit/CallbackProxy.java | |
| parent | 39cae6e02b0267b6a578b0ba346b96af482a1434 (diff) | |
If no touch icon is specified by a <link> tag, return <host>/apple-touch-icon.png as
the touch incon url instead. The DownloadTouchIcon class will handle the case that
this file does not exist on the server.
Change-Id: I8ab8fd65b571584d7b648af72c568f0b01c2dcaf
Diffstat (limited to 'core/java/android/webkit/CallbackProxy.java')
| -rw-r--r-- | core/java/android/webkit/CallbackProxy.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java index 15ffffdb4413..1b5651b324c8 100644 --- a/core/java/android/webkit/CallbackProxy.java +++ b/core/java/android/webkit/CallbackProxy.java @@ -1222,9 +1222,7 @@ class CallbackProxy extends Handler { // for null. WebHistoryItem i = mBackForwardList.getCurrentItem(); if (i != null) { - if (precomposed || i.getTouchIconUrl() == null) { - i.setTouchIconUrl(url); - } + i.setTouchIconUrl(url, precomposed); } // Do an unsynchronized quick check to avoid posting if no callback has // been set. |