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

Merge "Don't start face auth when device is going to sleep" into sc-dev am: 7499feba94 am: b265a5de9e

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

Change-Id: I6923313b07dbc9bc8399aa67eb098ed1316f440a
This commit is contained in:
Curtis Belmonte
2021-07-02 02:17:38 +00:00
committed by Automerger Merge Worker
parent 32a5f8b976 b265a5de9e
commit 5b91e0b756
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -975,12 +975,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
mPowerGestureIntercepted = false; mPowerGestureIntercepted = false;
mGoingToSleep = true; mGoingToSleep = true;
// Reset keyguard going away state so we can start listening for fingerprint. We
// explicitly DO NOT want to call
// mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false)
// here, since that will mess with the device lock state.
mUpdateMonitor.dispatchKeyguardGoingAway(false);
// Lock immediately based on setting if secure (user has a pin/pattern/password). // Lock immediately based on setting if secure (user has a pin/pattern/password).
// This also "locks" the device when not secure to provide easy access to the // This also "locks" the device when not secure to provide easy access to the
// camera while preventing unwanted input. // camera while preventing unwanted input.
@@ -1018,7 +1012,15 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
playSounds(true); playSounds(true);
} }
} }
mUpdateMonitor.dispatchStartedGoingToSleep(offReason); mUpdateMonitor.dispatchStartedGoingToSleep(offReason);
// Reset keyguard going away state so we can start listening for fingerprint. We
// explicitly DO NOT want to call
// mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false)
// here, since that will mess with the device lock state.
mUpdateMonitor.dispatchKeyguardGoingAway(false);
notifyStartedGoingToSleep(); notifyStartedGoingToSleep();
} }