Merge "Disallow interception of multitouch events" into tm-qpr-dev am: def6a36f8f

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

Change-Id: I75c06ab81f8b4186887731c13ceb8c5bc9e778ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index e53eea90ad33..e71cb157364c 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -4628,8 +4628,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);