| commit | 6e8b3652434606996f30c052e72e98627344cce1 | [log] [tgz] |
|---|---|---|
| author | Mady Mellor <madym@google.com> | Wed Nov 29 00:17:25 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 29 00:17:25 2023 +0000 |
| tree | 884a33c030d6990a0502acab638fe7d677f096c2 | |
| parent | 9b08963ce45b43d52ddb0a6145e35b045281dcba [diff] | |
| parent | 8e067cad829ed9019638d2903dc2cb591ae9aab8 [diff] |
Merge "Fix a potential NPE" into main
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 8f904c4..45c948b 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 @@ return; } - final boolean clickedBubbleIsCurrentlyExpandedBubble = - clickedBubble.getKey().equals(mExpandedBubble.getKey()); + final boolean clickedBubbleIsCurrentlyExpandedBubble = mExpandedBubble != null + && clickedBubble.getKey().equals(mExpandedBubble.getKey()); if (isExpanded()) { mExpandedAnimationController.onGestureFinished();