summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joshua Tsuji <tsuji@google.com> 2019-05-29 16:24:43 -0400
committer Joshua Tsuji <tsuji@google.com> 2019-05-29 16:33:19 -0400
commit4bb3e7e71413c544cb591de0e76edd21b4b1954e (patch)
tree96331ef390253da8a4fd3a8f856063b1515013ce
parentcb97a11bea0e2e6bb37b003c0851b0398c888307 (diff)
Prevent a crash when touching the stack while it's flinging out of the dismiss area.
Fixes: 133867082 Test: atest SystemUITests Change-Id: Id9a9eb85eeb53002a23f62605b21beafe1c4338f
-rw-r--r--packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java b/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java
index cfc14f83ec8f..6f1304b5fbcd 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java
@@ -271,6 +271,8 @@ public class StackAnimationController extends
},
DynamicAnimation.TRANSLATION_X, DynamicAnimation.TRANSLATION_Y);
+ // If we're flinging now, there's no more touch event to catch up to.
+ mFirstBubbleSpringingToTouch = false;
mIsMovingFromFlinging = true;
return destinationRelativeX;
}