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

Merge changes from topic "presubmit-am-cd23d9b2a39243fd926bc7a009462de9" into sc-v2-dev-plus-aosp

Browse Source 
* changes:
  [automerge] Revert "[DO NOT MERGE] Keyguard was hiding occluding activities" 2p: d7fe18428f
  Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"
This commit is contained in:
TreeHugger Robot
2022-03-10 02:34:58 +00:00
committed by Android (Google) Code Review
parent d497310b93 ab82171642
commit 0e7b89f740
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();