summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2015-08-19 01:32:40 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-19 01:32:40 +0000
commit40c758316302851a99cf6e285ed7b06497ac36f9 (patch)
tree86e56b12aaf0ef83c9dba70f58d70ed7daa0ca49
parentce6fb7bba967a9b33e5d3afe60fff66c5b2ca034 (diff)
parentb7f482ab41f3c50d2765c53db8b4e79f4e1b7903 (diff)
am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet
* commit 'b7f482ab41f3c50d2765c53db8b4e79f4e1b7903': Only call authenticate when we are not listening yet
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index eddee7bbad79..f39acdec9b67 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -1020,7 +1020,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
private void startListeningForFingerprint() {
if (DEBUG) Log.v(TAG, "startListeningForFingerprint()");
int userId = ActivityManager.getCurrentUser();
- if (isUnlockWithFingerprintPossible(userId)) {
+ if (!mFingerprintDetectionRunning && isUnlockWithFingerprintPossible(userId)) {
mUserHasAuthenticatedSinceBoot = mTrustManager.hasUserAuthenticatedSinceBoot(
ActivityManager.getCurrentUser());
if (mFingerprintCancelSignal != null) {