Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-03 00:55:29 +00:00
committed by Android (Google) Code Review
parent 4dbc321683 aa7b4ce544
commit 880c4ce9e3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java
View File

@@ -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 {