Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ea88117 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] [DO NOT MERGE] Keyguard was hiding occluding activities 2p: 267ecd15 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17043352

Change-Id: I85e0548488b115303d9501f98a03f6836f931dbf
parents a9120ace 267ecd15

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

+6 −1
Original line number Diff line number Diff line
@@ -2937,8 +2937,9 @@ 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;

                || keyguardForDozing) && !wakeAndUnlocking && !isWakingAndOccluded;

        if (keyguardForDozing) {

            updatePanelExpansionForKeyguard();

        }
@@ -3716,6 +3717,10 @@ 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();