commit 6e25a9d8319a7df686e12996c01f2f6b6416c21e
author Winson Chung <winsonc@google.com> Thu Jun 13 11:17:07 2019 -0700
committer Winson Chung <winsonc@google.com> Thu Jun 13 11:44:44 2019 -0700
tree 7427bceadd8612ddb52acc027501749f0502d4de
parent 3d6e96d5265cdea78ad4e01b0f9fde0eea539094

Fix issue with screen pinning check not apply in 2 button

Bug: 130687624
Test: Ensure you can't swipe up with screen pinning enabled in 2 button
Change-Id: I6635a9639262a4e96a104960eb5fbb3acaba8af7

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 097ff46..3ace25a 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -547,6 +547,10 @@
                         (mSystemUiStateFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0, base,
                         mInputMonitorCompat, mSwipeTouchRegion);
             }
+        } else {
+            if ((mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0) {
+                base = mResetGestureInputConsumer;
+            }
         }
         return base;
     }