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

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 3be24173c21b..8323d1e6bae3 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -4650,8 +4650,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);