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

Commit 4e800f47 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup flag big_picture_style_discard_empty_icon_bitmap_drawables." into main

parents 29af7ca3 be16a2bb

core/java/android/widget/flags/notification_widget_flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -28,16 +28,6 @@ flag { 
  }

}



flag {

    name: "big_picture_style_discard_empty_icon_bitmap_drawables"

    namespace: "systemui"

    description: "BigPictureStyle: Ignore Icon BitmapDrawables without Bitmaps"

    bug: "335878768"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

  name: "drop_non_existing_messages"

  namespace: "systemui"

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

+2 −6
Original line number Diff line number Diff line
@@ -125,12 +125,8 @@ 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?)");

                }

            }

        }