Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0dfa654 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

BigPictureNotificationImageView: log when Icon.loadDrawable fails 

When an app passes an invalid icon into a BigPictureStyle notification,
we want to know clearly and promptly, so log when we see those icon
loads fail.

Bug: 335878768
Test: manual
Flag: NONE
Change-Id: Idf193d70564c66d1f124655be816ef09757db95e
parent ca660ce3

core/java/com/android/internal/widget/BigPictureNotificationImageView.java

+12 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.graphics.drawable.Drawable; 
import android.graphics.drawable.Icon;

import android.net.Uri;

import android.util.AttributeSet;

import android.util.Log;

import android.widget.ImageView;

import android.widget.RemoteViews;
@@ -126,11 +127,19 @@ public class BigPictureNotificationImageView extends ImageView implements 


    private Drawable loadImage(Icon icon) {

        if (icon == null) return null;



        Drawable drawable = LocalImageResolver.resolveImage(icon, mContext, mMaximumDrawableWidth,

                mMaximumDrawableHeight);

        if (drawable == null) {

            return icon.loadDrawable(mContext);

        if (drawable != null) {

            return drawable;

        }



        drawable = icon.loadDrawable(mContext);

        if (drawable != null) {

            return drawable;

        }



        Log.e(TAG, "Couldn't load drawable for icon: " + icon);

        return null;

    }

}