From 4f872f95b44db380418c77cc1a6b865176534153 Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Mon, 1 Jun 2020 12:36:14 -0700
Subject: [PATCH] Protect against NPE

Bug: 157923809
Test: atest
Change-Id: Ice02bf571326ccdaf448e44152b6927c5bd6bd6b
---
 .../src/com/android/systemui/bubbles/BubbleLoggerImpl.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleLoggerImpl.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleLoggerImpl.java
index 0327cb4b29193..c5faae0d703e1 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleLoggerImpl.java
+++ b/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());
     }