Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev

packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt

@@ -121,14 +121,14 @@ constructor(
     }
 
     override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-        return maybeStartExpansion(event)
+        return canHandleMotionEvent() && startExpansion(event)
     }
 
-    private fun maybeStartExpansion(event: MotionEvent): Boolean {
+    private fun canHandleMotionEvent(): Boolean {
-        if (!wakeUpCoordinator.canShowPulsingHuns || qsExpanded ||
+        return wakeUpCoordinator.canShowPulsingHuns && !qsExpanded && !bouncerShowing
-                bouncerShowing) {
-            return false
     }
+
+    private fun startExpansion(event: MotionEvent): Boolean {
         if (velocityTracker == null) {
             velocityTracker = VelocityTracker.obtain()
         }
@@ -177,8 +177,12 @@ constructor(
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        if (!isExpanding) {
+        if (!canHandleMotionEvent()) {
-            return maybeStartExpansion(event)
+            return false
+        }
+
+        if (!isExpanding || event.actionMasked == MotionEvent.ACTION_DOWN) {
+            return startExpansion(event)
         }
         velocityTracker!!.addMovement(event)
         val y = event.y