commit | 87536679ce0f7fc58f90f607d89148f32837639a | [log] [tgz] |
---|---|---|
author | Fengjiang Li <fengjial@google.com> | Fri Jan 26 14:16:46 2024 -0800 |
committer | Fengjiang Li <fengjial@google.com> | Fri Jan 26 16:50:01 2024 -0800 |
tree | 0220dec109e8b2be95d2939c185117a5c7e3d68a | |
parent | e49c26dd796aeea150e80fa6e4e0d23ba6afb90d [diff] |
Fix NPE of touch handling in StatusBarTouchController#onControllerInterceptTouchEvent Postsubmit passes: https://android-build.corp.google.com/builds/abtd/run/L20300030001590062 Test: presubmit Flag: NONE Fix: 282945183 Change-Id: Idcf87f8cd45350c4876ea8b1ae2dffa5127bf27f
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) {