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

am: ed112e3c11 Change-Id: I60313cc9a4560fd8e8308108a4d878ab49fcbea1
2017-05-02 21:09:32 +00:00
parent a2ed986390 ed112e3c11
commit 7135f5d2e5
1 changed files with 9 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -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) {