summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2014-02-21 23:16:34 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-21 23:16:34 +0000
commitc34de1799596e1659c5edea61f89e807c8119705 (patch)
tree73c78599c673baaa64a560143049c099f8531bf0 /src/com/android/browser
parentb675f1c9af2e4e3e039a0cb69d934a5bba1830e4 (diff)
parent6bc5c74102a743b29cc34f7d9aa7079d5b4bba10 (diff)
downloadpackages_apps_Browser-c34de1799596e1659c5edea61f89e807c8119705.zip
packages_apps_Browser-c34de1799596e1659c5edea61f89e807c8119705.tar.gz
packages_apps_Browser-c34de1799596e1659c5edea61f89e807c8119705.tar.bz2
Merge "Fix the problem that the favicons on the history page are shown ramdomly when the page is scrolled."
Diffstat (limited to 'src/com/android/browser')
-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;