From 3358ad6070d5c121d13d3e6d451c76c5d1a76e02 Mon Sep 17 00:00:00 2001
From: Dave Mankoff <mankoff@google.com>
Date: Mon, 8 Jun 2020 15:32:56 -0400
Subject: [PATCH] Ensure that velocity tracker is never null.

Fixes: 153823196
Test: atest SystemUITests
Change-Id: I1177fbba5ddc3f3b8e6ffd5a1ea627daeaff471f
---
 .../android/systemui/statusbar/PulseExpansionHandler.kt    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
index 6d2cc6b08bc4e..7b2585324b9f5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
@@ -27,7 +27,6 @@ import android.os.SystemClock
 import android.view.MotionEvent
 import android.view.VelocityTracker
 import android.view.ViewConfiguration
-
 import com.android.systemui.Gefingerpoken
 import com.android.systemui.Interpolators
 import com.android.systemui.R
@@ -41,7 +40,6 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackScroll
 import com.android.systemui.statusbar.phone.HeadsUpManagerPhone
 import com.android.systemui.statusbar.phone.KeyguardBypassController
 import com.android.systemui.statusbar.phone.ShadeController
-
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.max
@@ -162,10 +160,12 @@ constructor(
 
             MotionEvent.ACTION_UP -> {
                 recycleVelocityTracker()
+                isExpanding = false
             }
 
             MotionEvent.ACTION_CANCEL -> {
                 recycleVelocityTracker()
+                isExpanding = false
             }
         }
         return false
@@ -181,7 +181,8 @@ constructor(
             return false
         }
 
-        if (!isExpanding || event.actionMasked == MotionEvent.ACTION_DOWN) {
+        if (velocityTracker == null || !isExpanding ||
+                event.actionMasked == MotionEvent.ACTION_DOWN) {
             return startExpansion(event)
         }
         velocityTracker!!.addMovement(event)