summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2014-03-10 18:06:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-10 18:06:08 +0000
commitf96e6247ebbd89a16a1bc38cf58f82a0cb07c985 (patch)
tree0a527c9c87f9c4e3224c285d02ca39ba00856710 /src
parent64450519436f2dcb064321391e407cd844cef95b (diff)
parentc34de1799596e1659c5edea61f89e807c8119705 (diff)
downloadpackages_apps_Browser-f96e6247ebbd89a16a1bc38cf58f82a0cb07c985.zip
packages_apps_Browser-f96e6247ebbd89a16a1bc38cf58f82a0cb07c985.tar.gz
packages_apps_Browser-f96e6247ebbd89a16a1bc38cf58f82a0cb07c985.tar.bz2
am c34de179: Merge "Fix the problem that the favicons on the history page are shown ramdomly when the page is scrolled."
* commit 'c34de1799596e1659c5edea61f89e807c8119705': Fix the problem that the favicons on the history page are shown ramdomly when the page is scrolled.
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/BrowserHistoryPage.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java
index 9493b85..930c413 100644
--- a/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@ -658,6 +658,8 @@ public class BrowserHistoryPage extends Fragment
if (data != null) {
item.setFavicon(BitmapFactory.decodeByteArray(data, 0,
data.length));
+ } else {
+ item.setFavicon(null);
}
item.setIsBookmark(cursor.getInt(HistoryQuery.INDEX_IS_BOOKMARK) == 1);
return item;