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

Merge "Fix potential NPE" into rvc-dev

Browse Source
This commit is contained in:
Mady Mellor
2020-04-01 14:57:04 +00:00
committed by Android (Google) Code Review
parent 1df5eb0130 3e1addffe0
commit 4c94835d49
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

@@ -1441,7 +1441,7 @@ public class BubbleStackView extends FrameLayout {
/** Expands the clicked bubble. */ /** Expands the clicked bubble. */
public void expandBubble(Bubble bubble) { public void expandBubble(Bubble bubble) {
if (bubble.equals(mBubbleData.getSelectedBubble())) { if (bubble != null && bubble.equals(mBubbleData.getSelectedBubble())) {
// If the bubble we're supposed to expand is the selected bubble, that means the // If the bubble we're supposed to expand is the selected bubble, that means the
// overflow bubble is currently expanded. Don't tell BubbleData to set this bubble as // overflow bubble is currently expanded. Don't tell BubbleData to set this bubble as
// selected, since it already is. Just call the stack's setSelectedBubble to expand it. // selected, since it already is. Just call the stack's setSelectedBubble to expand it.