summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2014-02-22 00:41:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-22 00:41:29 +0000
commit2cd02a04445e8b421dec3891b7da2022f80e11f1 (patch)
treefd05421e02cd6b2e141ed6a3d0ac9c01d4414afd /src
parentc07b176f83c7565bed29e2c2e4520326f00bc435 (diff)
parentc34de1799596e1659c5edea61f89e807c8119705 (diff)
downloadBrowser-2cd02a04445e8b421dec3891b7da2022f80e11f1.tar.gz
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 9493b85e..930c4135 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;