commit 0be8f08dc1d859853d432d4733e40cf0f35567e7
author Winson Chung <winsonc@google.com> Thu Feb 15 15:52:49 2018 -0800
committer Winson Chung <winsonc@google.com> Thu Feb 15 15:52:49 2018 -0800
tree 026cb68cd09b67632c362a654e9c435f1601dcfd
parent f56981d9753349a225dd82837397bea072c1b9fd

Fix crash when starting quickscrub while ending quickscrub animation.

Bug: 73500810
Test: Drag quickscrub, release, and before animation ends, drag again
Change-Id: I9d099282b9494d9dd7d70ded4e17a037d931879e

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java
index f4da0c3..2eea4bd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java
@@ -227,6 +227,10 @@
             case MotionEvent.ACTION_DOWN: {
                 int x = (int) event.getX();
                 int y = (int) event.getY();
+                // End any existing quickscrub animations before starting the new transition
+                if (mQuickScrubEndAnimator != null) {
+                    mQuickScrubEndAnimator.end();
+                }
                 mHomeButtonView = homeButton.getCurrentView();
                 if (isQuickScrubEnabled()
                         && mNavigationBarView.getDownHitTarget() == HIT_TARGET_HOME) {