Bug 902064: Folders on BookmarksListView are crashing. [r=lucasr]
authorSriram Ramasubramanian <sriram@mozilla.com>
Wed, 07 Aug 2013 08:44:42 -0700
changeset 143504 a0175d7ee613148c6641b7d56ba13901c172a2b8
parent 143503 97996b685d4f18db145ce8e1de23dec03dbb4d86
child 143505 9040f8043f4640f4943a0f392a89a8603e604a4f
push id25130
push userlrocha@mozilla.com
push dateWed, 21 Aug 2013 09:41:27 +0000
treeherdermozilla-central@b2486721572e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslucasr
bugs902064
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 902064: Folders on BookmarksListView are crashing. [r=lucasr]
mobile/android/base/home/FaviconsLoader.java
--- a/mobile/android/base/home/FaviconsLoader.java
+++ b/mobile/android/base/home/FaviconsLoader.java
@@ -39,18 +39,18 @@ class FaviconsLoader {
         }
 
         final Favicons favicons = Favicons.getInstance();
 
         do {
             final String url = c.getString(c.getColumnIndexOrThrow(URLColumns.URL));
 
             // We only want to load favicons from DB if they are not in the
-            // memory cache yet.
-            if (favicons.getFaviconFromMemCache(url) != null) {
+            // memory cache yet. The url is null for bookmark folders.
+            if (url == null || favicons.getFaviconFromMemCache(url) != null) {
                 continue;
             }
 
             urls.add(url);
         } while (c.moveToNext());
 
         return urls;
     }
@@ -111,9 +111,9 @@ class FaviconsLoader {
             final ContentResolver cr = getContext().getContentResolver();
 
             Cursor c = BrowserDB.getFaviconsForUrls(cr, mUrls);
             storeFaviconsInMemCache(c);
 
             return c;
         }
     }
-}
\ No newline at end of file
+}