Merge "Protect against NPE" into rvc-dev am: 2d1efb2e6f am: 9ebbfa4718 am: 21930b97ab am: 9f3a3d66ff

Original change: undetermined

Change-Id: I8eda1cd5256d0cd2d1e511e8b0c004b9cc5b5470

packages/SystemUI/src/com/android/systemui/bubbles/BubbleLoggerImpl.java

@@ -17,6 +17,7 @@
 package com.android.systemui.bubbles;
 
 import android.service.notification.StatusBarNotification;
+
 import com.android.internal.logging.UiEventLoggerImpl;
 
 /**
@@ -31,6 +32,10 @@ public class BubbleLoggerImpl extends UiEventLoggerImpl implements BubbleLogger
      * @param e UI event
      */
     public void log(Bubble b, UiEventEnum e) {
+        if (b.getEntry() == null) {
+            // Added from persistence -- TODO log this with specific event?
+            return;
+        }
         StatusBarNotification sbn = b.getEntry().getSbn();
         logWithInstanceId(e, sbn.getUid(), sbn.getPackageName(), sbn.getInstanceId());
     }