commit ad37e4620c4c9eb8cf8a27ba33cb86569089e41b
author Jagrut Desai <jagrutdesai@google.com> Mon Jan 29 19:05:12 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 29 19:05:12 2024 +0000
tree 517cae14f6d379ba0367ca3315bbc5fb886e31c0
parent fb147e122a9f7801f5bc170dae098f26c81d49c6
parent 2fee4eb040c7dad6f911584e9ad6aa8523e593e7

Merge "Fixing NullPointerException in TaskbarUIController" into main

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
index cda7855..d98e608 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
@@ -104,7 +104,7 @@
         if (!mCanIntercept) {
             return false;
         }
-        if (action == ACTION_MOVE) {
+        if (action == ACTION_MOVE && mDownEvents.contains(pid)) {
             float dy = ev.getY(idx) - mDownEvents.get(pid).y;
             float dx = ev.getX(idx) - mDownEvents.get(pid).x;
             if (mIsTrackpadReverseScroll) {