diff options
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 12 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserBookmarksAdapter.java | 11 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index f67292a3c..dc85ec02f 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -2362,7 +2362,15 @@ public class BrowserActivity extends Activity private void updateIcon(WebView view, Bitmap icon) { if (icon != null) { BrowserBookmarksAdapter.updateBookmarkFavicon(mResolver, - view, icon); + view.getOriginalUrl(), view.getUrl(), icon); + } + setFavicon(icon); + } + + private void updateIcon(String url, Bitmap icon) { + if (icon != null) { + BrowserBookmarksAdapter.updateBookmarkFavicon(mResolver, + null, url, icon); } setFavicon(icon); } @@ -2383,7 +2391,7 @@ public class BrowserActivity extends Activity // Call updateIcon instead of setFavicon so the bookmark // database can be updated. - updateIcon(view, favicon); + updateIcon(url, favicon); if (mSettings.isTracing()) { String host; diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java index bd2916674..36af1fc8a 100644 --- a/src/com/android/browser/BrowserBookmarksAdapter.java +++ b/src/com/android/browser/BrowserBookmarksAdapter.java @@ -258,18 +258,11 @@ class BrowserBookmarksAdapter extends BaseAdapter { * Update the bookmark's favicon. This is a convenience method for updating * a bookmark favicon for the originalUrl and url of the passed in WebView. * @param cr The ContentResolver to use. - * @param WebView The WebView containing the url to update. + * @param originalUrl The original url before any redirects. + * @param url The current url. * @param favicon The favicon bitmap to write to the db. */ /* package */ static void updateBookmarkFavicon(ContentResolver cr, - WebView view, Bitmap favicon) { - if (view != null) { - updateBookmarkFavicon(cr, view.getOriginalUrl(), view.getUrl(), - favicon); - } - } - - private static void updateBookmarkFavicon(ContentResolver cr, String originalUrl, String url, Bitmap favicon) { final Cursor c = queryBookmarksForUrl(cr, originalUrl, url, true); if (c == null) { |