From d7fe18428fe3455e25fb1ed5e052d2e9b498f065 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Thu, 10 Mar 2022 00:02:51 +0000
Subject: [PATCH] Revert "[DO NOT MERGE] Keyguard was hiding occluding
 activities"

This reverts commit 267ecd151e8e7ad313cbe1a511f18d2d78f2e459.

Reason for revert: regression b/223088536

Change-Id: I5e82ad358a8c7c7027415ab55c5d7e5bd3c05527
---
 .../com/android/systemui/statusbar/phone/StatusBar.java    | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 071c8c9117ec8..d4ce34010bfd0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -2937,9 +2937,8 @@ public class StatusBar extends SystemUI implements
         // turned off fully.
         boolean keyguardForDozing = mDozeServiceHost.getDozingRequested()
                 && (!mDeviceInteractive || isGoingToSleep() && (isScreenFullyOff() || mIsKeyguard));
-        boolean isWakingAndOccluded = isOccluded() && isWaking();
         boolean shouldBeKeyguard = (mStatusBarStateController.isKeyguardRequested()
-                || keyguardForDozing) && !wakeAndUnlocking && !isWakingAndOccluded;
+                || keyguardForDozing) && !wakeAndUnlocking;
         if (keyguardForDozing) {
             updatePanelExpansionForKeyguard();
         }
@@ -3717,10 +3716,6 @@ public class StatusBar extends SystemUI implements
                 == WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP;
     }
 
-    boolean isWaking() {
-        return mWakefulnessLifecycle.getWakefulness() == WakefulnessLifecycle.WAKEFULNESS_WAKING;
-    }
-
     public void notifyBiometricAuthModeChanged() {
         mDozeServiceHost.updateDozing();
         updateScrimController();