Merge "Don't start face auth when device is going to sleep" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
7499feba94
@@ -975,12 +975,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
mPowerGestureIntercepted = false;
|
||||
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).
|
||||
// This also "locks" the device when not secure to provide easy access to the
|
||||
// camera while preventing unwanted input.
|
||||
@@ -1018,7 +1012,15 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
|
||||
playSounds(true);
|
||||
}
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user