diff options
author | Adrian Roos <roosa@google.com> | 2015-01-07 20:50:29 +0100 |
---|---|---|
committer | Adrian Roos <roosa@google.com> | 2015-01-07 22:10:35 +0100 |
commit | 230635efe7ffb09d6dc56bfd9193aa1d89c8a898 (patch) | |
tree | 9bb960ef1ddb52ee7ef42c57898058323598bae3 /packages/SystemUI/src/com/android/systemui/keyguard | |
parent | 382d6a9ed2360ceb462ea46a60f0f106fdb52540 (diff) | |
download | frameworks_base-230635efe7ffb09d6dc56bfd9193aa1d89c8a898.zip frameworks_base-230635efe7ffb09d6dc56bfd9193aa1d89c8a898.tar.gz frameworks_base-230635efe7ffb09d6dc56bfd9193aa1d89c8a898.tar.bz2 |
Purge biometric weak and keyguard widgets
Bug: 18931518
Change-Id: I5da41908b1d6895a69f981e139f2d268327fafcd
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index f9e0219..d271727 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -313,9 +313,6 @@ public class KeyguardViewMediator extends SystemUI { resetKeyguardDonePendingLocked(); resetStateLocked(); adjustStatusBarLocked(); - // When we switch users we want to bring the new user to the biometric unlock even - // if the current user has gone to the backup. - KeyguardUpdateMonitor.getInstance(mContext).setAlternateUnlockEnabled(true); } } @@ -589,23 +586,6 @@ public class KeyguardViewMediator extends SystemUI { mSystemReady = true; mUpdateMonitor.registerCallback(mUpdateCallback); - // Suppress biometric unlock right after boot until things have settled if it is the - // selected security method, otherwise unsuppress it. It must be unsuppressed if it is - // not the selected security method for the following reason: if the user starts - // without a screen lock selected, the biometric unlock would be suppressed the first - // time they try to use it. - // - // Note that the biometric unlock will still not show if it is not the selected method. - // Calling setAlternateUnlockEnabled(true) simply says don't suppress it if it is the - // selected method. - if (mLockPatternUtils.usingBiometricWeak() - && mLockPatternUtils.isBiometricWeakInstalled()) { - if (DEBUG) Log.d(TAG, "suppressing biometric unlock during boot"); - mUpdateMonitor.setAlternateUnlockEnabled(false); - } else { - mUpdateMonitor.setAlternateUnlockEnabled(true); - } - doKeyguardLocked(null); } // Most services aren't available until the system reaches the ready state, so we |