Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'ad7719dea4e8fd34854e4dcc918fc593c4416d82':
  Crash apps with bad notification icons.
This commit is contained in:
Daniel Sandler
2015-08-11 14:22:12 +00:00
committed by Android Git Automerger
parent 3605247746 ad7719dea4
commit 5bba07eb01
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -41,6 +41,7 @@ import android.content.res.Resources;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -1713,10 +1714,16 @@ public abstract class BaseStatusBar extends SystemUI implements
sbn.getPackageName() + "/0x" + Integer.toHexString(sbn.getId()), n); sbn.getPackageName() + "/0x" + Integer.toHexString(sbn.getId()), n);
iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE); 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( final StatusBarIcon ic = new StatusBarIcon(
sbn.getUser(), sbn.getUser(),
sbn.getPackageName(), sbn.getPackageName(),
n.getSmallIcon(), smallIcon,
n.iconLevel, n.iconLevel,
n.number, n.number,
n.tickerText); n.tickerText);