From 4bb3e7e71413c544cb591de0e76edd21b4b1954e Mon Sep 17 00:00:00 2001
From: Joshua Tsuji <tsuji@google.com>
Date: Wed, 29 May 2019 16:24:43 -0400
Subject: Prevent a crash when touching the stack while it's flinging out of
 the dismiss area.

Fixes: 133867082
Test: atest SystemUITests
Change-Id: Id9a9eb85eeb53002a23f62605b21beafe1c4338f
---
 .../android/systemui/bubbles/animation/StackAnimationController.java    | 2 ++
 1 file changed, 2 insertions(+)

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;
     }
-- 
cgit v1.2.3-59-g8ed1b