Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"

Browse Source 
This reverts commit 267ecd151e.

Reason for revert: regression b/223088536

Change-Id: I5e82ad358a8c7c7027415ab55c5d7e5bd3c05527
This commit is contained in:
Matt Pietal
2022-03-10 00:02:51 +00:00
parent 267ecd151e
commit d7fe18428f
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -2937,9 +2937,8 @@ public class StatusBar extends SystemUI implements
// turned off fully. // turned off fully.
boolean keyguardForDozing = mDozeServiceHost.getDozingRequested() boolean keyguardForDozing = mDozeServiceHost.getDozingRequested()
&& (!mDeviceInteractive || isGoingToSleep() && (isScreenFullyOff() || mIsKeyguard)); && (!mDeviceInteractive || isGoingToSleep() && (isScreenFullyOff() || mIsKeyguard));
boolean isWakingAndOccluded = isOccluded() && isWaking();
boolean shouldBeKeyguard = (mStatusBarStateController.isKeyguardRequested() boolean shouldBeKeyguard = (mStatusBarStateController.isKeyguardRequested()
|| keyguardForDozing) && !wakeAndUnlocking && !isWakingAndOccluded; || keyguardForDozing) && !wakeAndUnlocking;
if (keyguardForDozing) { if (keyguardForDozing) {
updatePanelExpansionForKeyguard(); updatePanelExpansionForKeyguard();
} }
@@ -3717,10 +3716,6 @@ public class StatusBar extends SystemUI implements
== WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP; == WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP;
} }
boolean isWaking() {
return mWakefulnessLifecycle.getWakefulness() == WakefulnessLifecycle.WAKEFULNESS_WAKING;
}
public void notifyBiometricAuthModeChanged() { public void notifyBiometricAuthModeChanged() {
mDozeServiceHost.updateDozing(); mDozeServiceHost.updateDozing();
updateScrimController(); updateScrimController();