Bug 1080016 - Display favicons properly after interrupted page loads, r=ckitching

mobile/android/base/db/LocalBrowserDB.java

@@ -1013,7 +1013,14 @@ public class LocalBrowserDB {
 
         try {
             if (c.moveToFirst()) {
-                return c.getString(c.getColumnIndexOrThrow(History.FAVICON_URL));
+                // Interrupted page loads can leave History items without a valid favicon_id.
+                final int columnIndex = c.getColumnIndexOrThrow(History.FAVICON_URL);
+                if (!c.isNull(columnIndex)) {
+                    final String faviconURL = c.getString(columnIndex);
+                    if (faviconURL != null) {
+                        return faviconURL;
+                    }
+                }
             }
         } finally {
             c.close();