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

Merge "[DO NOT MERGE] Keyguard was hiding occluding activities" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-01 18:48:39 +00:00
committed by Android (Google) Code Review
parent 28fccbd8b8 267ecd151e
commit 1774ba8a97
1 changed files with 6 additions and 1 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,8 +2937,9 @@ 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; || keyguardForDozing) && !wakeAndUnlocking && !isWakingAndOccluded;
if (keyguardForDozing) { if (keyguardForDozing) {
updatePanelExpansionForKeyguard(); updatePanelExpansionForKeyguard();
} }
@@ -3716,6 +3717,10 @@ 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();