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"

Browse Source
This commit is contained in:
Adrian Roos
2017-05-02 21:00:40 +00:00
committed by Gerrit Code Review
parent 34e0a257d5 edca4f5320
commit ed112e3c11
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) { if (mIcon == null) {
return false; 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) { if (drawable == null) {
Log.w(TAG, "No icon for slot " + mSlot); Log.w(TAG, "No icon for slot " + mSlot + "; " + mIcon.icon);
return false; return false;
} }
if (withClear) { if (withClear) {