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

Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev

Browse Source
This commit is contained in:
Danielle Millett
2012-05-29 06:24:05 -07:00
committed by Android (Google) Code Review
parent c3a5cf9aab cafd387d7a
commit 45973d6d19
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
View File

@@ -532,11 +532,6 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
if (DEBUG) Log.d(TAG, "screen off");
mScreenOn = false;
mForgotPattern = false;
if (mBiometricUnlock != null) {
mSuppressBiometricUnlock =
mUpdateMonitor.getPhoneState() != TelephonyManager.CALL_STATE_IDLE
|| mHasDialog;
}
// Emulate activity life-cycle for both lock and unlock screen.
if (mLockScreen != null) {
@@ -991,6 +986,17 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
restartBiometricUnlock = mBiometricUnlock.stop();
}
// Prevents biometric unlock from coming up immediately after a phone call or if there
// is a dialog on top of lockscreen. It is only updated if the screen is off because if the
// screen is on it's either because of an orientation change, or when it first boots.
// In both those cases, we don't want to override the current value of
// mSuppressBiometricUnlock and instead want to use the previous value.
if (!mScreenOn) {
mSuppressBiometricUnlock =
mUpdateMonitor.getPhoneState() != TelephonyManager.CALL_STATE_IDLE
|| mHasDialog;
}
// If the biometric unlock is not being used, we don't bother constructing it. Then we can
// simply check if it is null when deciding whether we should make calls to it.
mBiometricUnlock = null;