am 90abb78b: am 678f7edd: Merge "Avoid SystemUI crash due to NPE"

* commit '90abb78b51a35055f86dee35c4e391e74f325125': Avoid SystemUI crash due to NPE
2014-05-08 21:08:24 +00:00
parent 33c08e2986 90abb78b51
commit 2dc97d48b9
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@ -841,6 +841,9 @@ public abstract class BaseStatusBar extends SystemUI implements
    }

    protected void addNotificationViews(NotificationData.Entry entry) {
+        if (entry == null) {
+            return;
+        }
        // Add the expanded view and icon.
        int pos = mNotificationData.add(entry);
        if (DEBUG) {