From a2433db0abd3c1bb29234b5ca54ea6bc2def2f14 Mon Sep 17 00:00:00 2001 From: Joshua Tsuji Date: Thu, 12 Mar 2020 17:56:22 -0400 Subject: [PATCH] Fix NPE with disabled overflow. Test: atest SystemUITests Fixes: 151345204 Change-Id: I470b28c74da39e966568712d15934db6a41615f7 --- .../com/android/systemui/bubbles/BubbleStackView.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index 0b7dbd2bfa2e4..0778d5b54493d 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java @@ -424,6 +424,7 @@ public class BubbleStackView extends FrameLayout { private int mOrientation = Configuration.ORIENTATION_UNDEFINED; + @Nullable private BubbleOverflow mBubbleOverflow; private boolean mShouldShowUserEducation; @@ -1387,7 +1388,7 @@ public class BubbleStackView extends FrameLayout { Log.d(TAG, "onBubbleDragStart: bubble=" + bubble); } - if (bubble.equals(mBubbleOverflow.getIconView())) { + if (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView())) { return; } @@ -1403,7 +1404,8 @@ public class BubbleStackView extends FrameLayout { /** Called with the coordinates to which an individual bubble has been dragged. */ public void onBubbleDragged(View bubble, float x, float y) { - if (!mIsExpanded || mIsExpansionAnimating || bubble.equals(mBubbleOverflow.getIconView())) { + if (!mIsExpanded || mIsExpansionAnimating + || (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView()))) { return; } @@ -1418,7 +1420,8 @@ public class BubbleStackView extends FrameLayout { Log.d(TAG, "onBubbleDragFinish: bubble=" + bubble); } - if (!mIsExpanded || mIsExpansionAnimating || bubble.equals(mBubbleOverflow.getIconView())) { + if (!mIsExpanded || mIsExpansionAnimating + || (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView()))) { return; }