Merge "Avoid SystemUI crash due to NPE"

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