diff options
author | Matt Pietal <mpietal@google.com> | 2022-03-10 00:02:51 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-10 03:19:56 +0000 |
commit | fa935c5737f9ac60c428c5ce6e53b5eeaef85dd2 (patch) | |
tree | 2f801484f19629031f363995f39c71d7747c92b5 | |
parent | ec198dbcaea1a58660e95cb748c7f9722d56e13f (diff) | |
download | base-fa935c5737f9ac60c428c5ce6e53b5eeaef85dd2.tar.gz |
Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"
This reverts commit 267ecd151e8e7ad313cbe1a511f18d2d78f2e459.
Reason for revert: regression b/223088536
Change-Id: I5e82ad358a8c7c7027415ab55c5d7e5bd3c05527
(cherry picked from commit d7fe18428fe3455e25fb1ed5e052d2e9b498f065)
Merged-In: I5e82ad358a8c7c7027415ab55c5d7e5bd3c05527
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 7 |
1 files changed, 1 insertions, 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 17937ca3a9f0..33212182cfcf 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(); } @@ -3715,10 +3714,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(); |