From 6e25a9d8319a7df686e12996c01f2f6b6416c21e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 13 Jun 2019 11:17:07 -0700
Subject: [PATCH] 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
---
 .../src/com/android/quickstep/TouchInteractionService.java    | 4 ++++
 1 file changed, 4 insertions(+)

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 097ff46592..3ace25ad68 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 @@ public class TouchInteractionService extends Service implements
                         (mSystemUiStateFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0, base,
                         mInputMonitorCompat, mSwipeTouchRegion);
             }
+        } else {
+            if ((mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0) {
+                base = mResetGestureInputConsumer;
+            }
         }
         return base;
     }