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

Do not count AOD showing changes as keyguard's

Browse Source 
AOD status changed after keyguard was set as going away, which
reset mKeyguardGoingAway back to false and put activities to sleep.

Bug: 158640144
Test: Unlock keyguard during AOD2
Change-Id: I9335045668f90d477d19dada0185447bfa3cb2a7
This commit is contained in:
Louis Chang
2020-07-03 10:54:40 +08:00
parent 8d737ec862
commit fc0cdd8526
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.
*/
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;
// 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) {
return;
}