Merge "BigPictureStyle: discard empty Icon BitmapDrawables" into main (99384279) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.util.AttributeSet;
		import android.util.Log;
		import android.widget.ImageView;
		import android.widget.RemoteViews;
		import android.widget.flags.Flags;

		import com.android.internal.R;

		@@ -124,9 +125,14 @@ public class BigPictureNotificationImageView extends ImageView implements
		public void setImageDrawable(@Nullable Drawable drawable) {
		if (drawable instanceof BitmapDrawable bitmapDrawable) {
		if (bitmapDrawable.getBitmap() == null) {
		if (Flags.bigPictureStyleDiscardEmptyIconBitmapDrawables()) {
		Log.e(TAG, "discarding BitmapDrawable with null Bitmap (invalid image file?)");
		drawable = null;
		} else {
		Log.e(TAG, "setting BitmapDrawable with null Bitmap (invalid image file?)");
		}
		}
		}

		super.setImageDrawable(drawable);
		}