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

Commit ad7719de authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Crash apps with bad notification icons." into mnc-dev

parents 4dbb37ae 33439810

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

+8 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.content.res.Resources; 
import android.database.ContentObserver;

import android.graphics.PorterDuff;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Icon;

import android.os.AsyncTask;

import android.os.Build;

import android.os.Bundle;
@@ -1713,10 +1714,16 @@ public abstract class BaseStatusBar extends SystemUI implements 
                sbn.getPackageName() + "/0x" + Integer.toHexString(sbn.getId()), n);

        iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);



        final Icon smallIcon = n.getSmallIcon();

        if (smallIcon == null) {

            handleNotificationError(sbn,

                    "No small icon in notification from " + sbn.getPackageName());

            return null;

        }

        final StatusBarIcon ic = new StatusBarIcon(

                sbn.getUser(),

                sbn.getPackageName(),

                n.getSmallIcon(),

                smallIcon,

                n.iconLevel,

                n.number,

                n.tickerText);