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

Commit ed112e3c authored by Adrian Roos's avatar Adrian Roos Committed by Gerrit Code Review
Browse files

Merge "StatusBar: Catch OOM caused by third-party icons"

parents 34e0a257 edca4f53

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

+9 −2
Original line number Diff line number Diff line
@@ -188,9 +188,16 @@ public class StatusBarIconView extends AnimatedImageView { 
        if (mIcon == null) {

            return false;

        }

        Drawable drawable = getIcon(mIcon);

        Drawable drawable;

        try {

            drawable = getIcon(mIcon);

        } catch (OutOfMemoryError e) {

            Log.w(TAG, "OOM while inflating " + mIcon.icon + " for slot " + mSlot);

            return false;

        }



        if (drawable == null) {

            Log.w(TAG, "No icon for slot " + mSlot);

            Log.w(TAG, "No icon for slot " + mSlot + "; " + mIcon.icon);

            return false;

        }

        if (withClear) {