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

Merge "Keyguard: fix possible divergent state" into pi-dev

Browse Source 
am: 5d8dfe17c8

Change-Id: I5a34a26dec8c63abb3e210ab9209b8de43b0f32c
This commit is contained in:
Adrian Roos
2018-04-25 08:42:45 -07:00
committed by android-build-merger
parent 72e8d917d2 5d8dfe17c8
commit a6d97163d6
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1854,6 +1854,8 @@ public class KeyguardViewMediator extends SystemUI {
synchronized (KeyguardViewMediator.this) {
if (!mHiding) {
// Tell ActivityManager that we canceled the keyguardExitAnimation.
setShowingLocked(mShowing, mAodShowing, mSecondaryDisplayShowing, true /* force */);
return;
}
mHiding = false;

2
services/core/java/com/android/server/am/KeyguardController.java
View File

@@ -121,6 +121,8 @@ class KeyguardController {
void setKeyguardShown(boolean keyguardShowing, boolean aodShowing,
int secondaryDisplayShowing) {
boolean showingChanged = keyguardShowing != mKeyguardShowing || aodShowing != mAodShowing;
// If keyguard is going away, but SystemUI aborted the transition, need to reset state.
showingChanged |= mKeyguardGoingAway && keyguardShowing;
if (!showingChanged && secondaryDisplayShowing == mSecondaryDisplayShowing) {
return;
}