summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Mady Mellor <madym@google.com> 2023-11-28 14:46:48 -0800
committer Mady Mellor <madym@google.com> 2023-11-28 14:46:48 -0800
commit8e067cad829ed9019638d2903dc2cb591ae9aab8 (patch)
tree43bf739066de9d54dc33e93dbd9f3e39af22c2f9 /libs
parent2041a1e0867a1dfdbf929dd1f063c8ae2d39ee17 (diff)
Fix a potential NPE
Test: none / treehugger Bug: 312444249 Change-Id: I05fdd88952e52ec69ce7fd08a6e160f2c11dfcbb
Diffstat (limited to 'libs')
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
index 8f904c42d247..45c948ba0554 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
@@ -537,8 +537,8 @@ public class BubbleStackView extends FrameLayout
return;
}
- final boolean clickedBubbleIsCurrentlyExpandedBubble =
- clickedBubble.getKey().equals(mExpandedBubble.getKey());
+ final boolean clickedBubbleIsCurrentlyExpandedBubble = mExpandedBubble != null
+ && clickedBubble.getKey().equals(mExpandedBubble.getKey());
if (isExpanded()) {
mExpandedAnimationController.onGestureFinished();