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