From edc7917521ab73e5d737ae03ae8e38fb120fbce0 Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Fri, 16 Jul 2021 18:55:08 +0800
Subject: [PATCH] Fix unable to swipe up to exit one-handed mode under 2 button
 navigation

Remove redundant condition checking when consuming One-handed mode
gesture events.

Bug: 193761450

Test: manual
Test: atest WMShellUnitTests
Change-Id: Id4687cb579c17d7de1a08b32c003e656cbbce820
---
 .../src/com/android/quickstep/TouchInteractionService.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 069ed11553..b6dc833967 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -564,8 +564,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                 } else {
                     mUncheckedConsumer = InputConsumer.NO_OP;
                 }
-            } else if (mDeviceState.canTriggerOneHandedAction(event)
-                    && !mDeviceState.isOneHandedModeActive()) {
+            } else if (mDeviceState.canTriggerOneHandedAction(event)) {
                 // Consume gesture event for triggering one handed feature.
                 mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
                         InputConsumer.NO_OP, mInputMonitorCompat);