commit 30d412c3fe1453b3d47e09f4659cf66bc8cda258
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 07 19:01:57 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 07 19:01:57 2023 +0000
tree b9afd83b25c973dcd492b874adb9248ff7ea0316
parent 2c34cba0d3ca7bd93edc884f0cebeb1435df60f7
parent ba4a1e0b452ea3452db71d2d9db76ab37721142d

[coastguard skipped] Merge sparse cherrypicks from sparse-9662652-L34400000958984256 into tm-qpr2-release.

COASTGUARD_SKIP: I7795abe0aebefca2d42998a672abfd12f951d501
COASTGUARD_SKIP: Ie572a0ae8ae4d687b86ea6a4011b4fdc33b43cd7

Change-Id: I1136d0f649849f51731523c4081424ac8a70fbea

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index d341531..9e25555 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -43,7 +43,6 @@
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
 
 import android.app.ActivityTaskManager;
@@ -382,7 +381,6 @@
                 || mRotationTouchHelper.isTaskListFrozen();
         return canStartWithNavHidden
                 && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0
-                && (mSystemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) == 0
                 && (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0
                 && (mSystemUiStateFlags & SYSUI_STATE_MAGNIFICATION_OVERLAP) == 0
                 && ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0