Merge "Fix NPE" into rvc-dev am: 880c4ce9e3 am: 1bf69e64b5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11710011

Change-Id: I7bdd915686f281ce791eacc9cf4e4bc111bc71f9

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 {