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

Commit 0e7b89f7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerge] Revert "[DO NOT MERGE] Keyguard was hiding occluding activities" 2p: d7fe1842
  Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"
parents d497310b ab821716

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

+1 −6
Original line number Diff line number Diff line
@@ -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();

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