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

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

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

Change-Id: I0ab9d69f81f905897f8df99a355dc9d265421c20
This commit is contained in:
Josh Tsuji
2021-08-06 18:21:55 +00:00
committed by Automerger Merge Worker
parent 4bcdc2c58c 01681509df
commit 713ea70c78
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -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 // 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. // 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); setShowingLocked(mShowing);
} }
} }