From e6ef8dac281c7185eb4440a77467a43a7c1c454a Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 30 Apr 2019 11:13:20 -0700 Subject: [PATCH] Removing screen pinning flag check - The flag may be inaccurate, revert to the activity manager check for now Bug: 131552865 Test: Manual Change-Id: If7c00ba7a1cbb726dcd65993451e82d76778fd4b --- .../src/com/android/quickstep/TouchInteractionService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 c91bb1b4d0..ff2180b485 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java @@ -24,7 +24,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; -import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; import android.annotation.TargetApi; import android.app.ActivityManager.RunningTaskInfo; @@ -436,9 +435,9 @@ public class TouchInteractionService extends Service implements } private boolean isInValidSystemUiState() { - return (mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) == 0 - && (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0 - && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0; + return (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0 + && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0 + && !ActivityManagerWrapper.getInstance().isLockToAppActive(); } private InputConsumer newConsumer(boolean useSharedState, MotionEvent event) {