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

Commit 713ea70c authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Fix KeyguardTests#testScreenOffCausesSingleStopAod" into sc-dev am:... 

Merge "Fix KeyguardTests#testScreenOffCausesSingleStopAod" into sc-dev am: c4c7e0b4 am: 01681509

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

Change-Id: I0ab9d69f81f905897f8df99a355dc9d265421c20
parents 4bcdc2c5 01681509

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −1
Original line number Diff line number Diff line
@@ -2759,7 +2759,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 


        // Don't hide the keyguard due to a doze change if there's a lock pending, because we're

        // just going to show it again.

        if (mShowing || !mPendingLock) {

        // If the device is not capable of controlling the screen off animation, SysUI needs to

        // update lock screen state in ATMS here, otherwise ATMS tries to resume activities when

        // enabling doze state.

        if (mShowing || !mPendingLock || !mDozeParameters.canControlUnlockedScreenOff()) {

            setShowingLocked(mShowing);

        }

    }