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

Merge "Do not count AOD showing changes as keyguard's" into rvc-dev am: 9e8c7bd645 am: afe4e0d755

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

Change-Id: Id8d3da1c97c9f9a34764c1db32d287d82fb37b46
This commit is contained in:
Louis Chang
2020-07-03 15:24:12 +00:00
committed by Automerger Merge Worker
parent 5342449490 afe4e0d755
commit 36895f6844
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/KeyguardController.java
View File

@@ -133,10 +133,11 @@ class KeyguardController {
* Update the Keyguard showing state. * Update the Keyguard showing state.
*/ */
void setKeyguardShown(boolean keyguardShowing, boolean aodShowing) { void setKeyguardShown(boolean keyguardShowing, boolean aodShowing) {
// If keyguard is going away, but SystemUI aborted the transition, need to reset state.
final boolean keyguardChanged = keyguardShowing != mKeyguardShowing
|| mKeyguardGoingAway && keyguardShowing;
final boolean aodChanged = aodShowing != mAodShowing; final boolean aodChanged = aodShowing != mAodShowing;
// If keyguard is going away, but SystemUI aborted the transition, need to reset state.
// Do not reset keyguardChanged status if this is aodChanged.
final boolean keyguardChanged = (keyguardShowing != mKeyguardShowing)
|| (mKeyguardGoingAway && keyguardShowing && !aodChanged);
if (!keyguardChanged && !aodChanged) { if (!keyguardChanged && !aodChanged) {
return; return;
} }