Bug 1272021 - FaviconView.updateImageInternal(): Exit early if bitmap is null. r?ahunt
MozReview-Commit-ID: 2ZtAMI1XMoC
--- a/mobile/android/base/java/org/mozilla/gecko/widget/FaviconView.java
+++ b/mobile/android/base/java/org/mozilla/gecko/widget/FaviconView.java
@@ -188,16 +188,17 @@ public class FaviconView extends ImageVi
* (Favicons class), so as to exploit caching.
*/
private void updateImageInternal(Bitmap bitmap, String key, boolean allowScaling) {
if (bitmap == null) {
Log.w(LOGTAG, "updateImageInternal() called without bitmap");
// At this point we do not have a page URL anymore.
showDefaultFavicon(null);
+ return;
}
// Reassigning the same bitmap? Don't bother.
if (mUnscaledBitmap == bitmap) {
return;
}
mUnscaledBitmap = bitmap;
mIconBitmap = bitmap;