Bug 1272021 - FaviconView.updateImageInternal(): Exit early if bitmap is null. r?ahunt draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Wed, 11 May 2016 20:00:41 +0200
changeset 365963 5992a5504869042c8a04705b6e04fb53f2a97f83
parent 365962 a8f80b823c8d5434ae50bcec715846e854365f42
child 520668 5a6fbae480abaa1a56722ac69142acae7fc4b5c4
push id17863
push users.kaspari@gmail.com
push dateWed, 11 May 2016 18:01:11 +0000
reviewersahunt
bugs1272021
milestone49.0a1
Bug 1272021 - FaviconView.updateImageInternal(): Exit early if bitmap is null. r?ahunt MozReview-Commit-ID: 2ZtAMI1XMoC
mobile/android/base/java/org/mozilla/gecko/widget/FaviconView.java
--- 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;