From aa7b4ce544afa825ac7174a430800eff13821ec0 Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Tue, 2 Jun 2020 16:31:35 -0700
Subject: [PATCH] Fix NPE

Test: treehugger
Bug: 158037445
Change-Id: I2bdd3f926ea55ee3074036655c17c595b1e1ac97
---
 .../com/android/systemui/bubbles/BubbleOverflowActivity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java
index 8fd20517782f8..3e694b9f5d2a4 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java
@@ -285,7 +285,10 @@ class BubbleOverflowAdapter extends RecyclerView.Adapter<BubbleOverflowAdapter.V
                     }
                 });
 
-        ShortcutInfo info = b.getEntry().getRanking().getShortcutInfo();
+        // If the bubble was persisted, the entry is null but it should have shortcut info
+        ShortcutInfo info = b.getEntry() == null
+                ? b.getShortcutInfo()
+                : b.getEntry().getRanking().getShortcutInfo();
         if (info == null) {
             Log.d(TAG, "ShortcutInfo required to bubble but none found for " + b);
         } else {