Merge "Revert "Disallow interception of multitouch events"" into tm-qpr-dev am: 3de02c8174 am: befafec352

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

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

1 files changed, 2 insertions, 7 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index 33953854600b..5a8dec1865f9 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -4723,13 +4723,8 @@ public final class NotificationPanelViewController implements Dumpable {
              gesture possible. */
             int pointerIndex = event.findPointerIndex(mTrackingPointer);
             if (pointerIndex < 0) {
-                if (mTrackingPointer < 0) {
-                    pointerIndex = 0;
-                    mTrackingPointer = event.getPointerId(pointerIndex);
-                } else {
-                    mShadeLog.logMotionEvent(event, "Skipping intercept of multitouch pointer");
-                    return false;
-                }
+                pointerIndex = 0;
+                mTrackingPointer = event.getPointerId(pointerIndex);
             }
             final float x = event.getX(pointerIndex);
             final float y = event.getY(pointerIndex);