diff options
| author | Adrian Roos <roosa@google.com> | 2015-09-03 19:57:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 19:57:58 +0000 |
| commit | 95179ad4be0377dd9fd35818145f705bcded0d28 (patch) | |
| tree | f41b5f648f923316e9c3fea1f3414911d234c52a /packages/Keyguard | |
| parent | 4eb81345da21efc2b9731cb1969704081064690c (diff) | |
| parent | 54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481 (diff) | |
| download | frameworks_base-95179ad4be0377dd9fd35818145f705bcded0d28.zip frameworks_base-95179ad4be0377dd9fd35818145f705bcded0d28.tar.gz frameworks_base-95179ad4be0377dd9fd35818145f705bcded0d28.tar.bz2 | |
am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481':
Poke fingerprint timeout when vold password is correct
Diffstat (limited to 'packages/Keyguard')
| -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(); } /** |