summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2014-02-22 00:52:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-22 00:52:16 +0000
commit08d346549686bdb6443853d93e6582b12287bff3 (patch)
treefd3b81e597fa2ac84df2dc510add54ca9526278e /src
parent80c5561d0c5ae5298009b42a5307fefcf67bb7bc (diff)
parent2cd02a04445e8b421dec3891b7da2022f80e11f1 (diff)
downloadBrowser-08d346549686bdb6443853d93e6582b12287bff3.tar.gz
am 2cd02a04: am c34de179: Merge "Fix the problem that the favicons on the history page are shown ramdomly when the page is scrolled."
* commit '2cd02a04445e8b421dec3891b7da2022f80e11f1': 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;