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

Commit 06433bd9 authored by Dan Sandler's avatar Dan Sandler Committed by Justin Harrison
Browse files

Avoid crashing on corrupted notifications. 

If a notification content view has an @id/icon or
@id/right_icon, we need to make sure those ImageViews
actually have a drawable inside.

Bug: 19487078
Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4
parent 1f9a26af

packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper { 


        // If the icon already has a color filter, we assume that we already forced the icon to be

        // white when we created the notification.

        mIconForceGraysaleWhenDark = mIcon != null && mIcon.getDrawable().getColorFilter() != null;

        final Drawable iconDrawable = mIcon != null ? mIcon.getDrawable() : null;

        mIconForceGraysaleWhenDark = iconDrawable != null && iconDrawable.getColorFilter() != null;

    }



    private ImageView resolveIcon(ImageView largeIcon, ImageView rightIcon) {