Merge "Disallow interception of multitouch events" into tm-qpr-dev am: def6a36f8f am: 283122b185 am: e1470e590b am: 28a1138bfb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21712291

Change-Id: Ia4e62061165c47a567741d4eccdea97623339f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-07 21:53:25 +00:00
committed by Automerger Merge Worker

View File

@@ -4720,8 +4720,13 @@ public final class NotificationPanelViewController implements Dumpable {
gesture possible. */
int pointerIndex = event.findPointerIndex(mTrackingPointer);
if (pointerIndex < 0) {
pointerIndex = 0;
mTrackingPointer = event.getPointerId(pointerIndex);
if (mTrackingPointer < 0) {
pointerIndex = 0;
mTrackingPointer = event.getPointerId(pointerIndex);
} else {
mShadeLog.logMotionEvent(event, "Skipping intercept of multitouch pointer");
return false;
}
}
final float x = event.getX(pointerIndex);
final float y = event.getY(pointerIndex);