diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java index 8fd20517782f..3e694b9f5d2a 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 { |