diff options
| author | Adrian Roos <roosa@google.com> | 2015-09-03 19:41:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-03 19:41:22 +0000 |
| commit | 95200e6f4eb34818ac0b652167cffacfcfb4fdff (patch) | |
| tree | 1468f1ca01c3c8c6f213e4a8e9e222d7ab1f913e /packages/Keyguard/src | |
| parent | 1b5cc3a4ba46029b798adb9e362d87df5673bc52 (diff) | |
| parent | f6d51acec69366b6ea34f5e0c9aa8cc840f04a4d (diff) | |
| download | frameworks_base-95200e6f4eb34818ac0b652167cffacfcfb4fdff.zip frameworks_base-95200e6f4eb34818ac0b652167cffacfcfb4fdff.tar.gz frameworks_base-95200e6f4eb34818ac0b652167cffacfcfb4fdff.tar.bz2 | |
Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
Diffstat (limited to 'packages/Keyguard/src')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index cfc232c..b752c9b 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -1348,9 +1348,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { */ private void handleKeyguardReset() { if (DEBUG) Log.d(TAG, "handleKeyguardReset"); - if (!isUnlockingWithFingerprintAllowed()) { - updateFingerprintListeningState(); - } + updateFingerprintListeningState(); } /** |