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

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

Browse Source 
am: 7135f5d2e5

Change-Id: I2b807be9ff69796ccc3dde64fb215250d9690717
This commit is contained in:
Adrian Roos
2017-05-02 21:14:20 +00:00
committed by android-build-merger
parent 4db9f6d393 7135f5d2e5
commit 6983178c59
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
View File

@@ -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) {