summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-08-19 00:59:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-19 00:59:06 +0000
commitb7f482ab41f3c50d2765c53db8b4e79f4e1b7903 (patch)
tree86fdbc1d207f9594757a1ef9581eeaecaea64cdf /packages/Keyguard
parent7ef772713fac5d7b69874f2b972cdec7a60f074b (diff)
parentee2cfe48d4fb36906c59c2ae545808dba01f90d8 (diff)
downloadframeworks_base-b7f482ab41f3c50d2765c53db8b4e79f4e1b7903.zip
frameworks_base-b7f482ab41f3c50d2765c53db8b4e79f4e1b7903.tar.gz
frameworks_base-b7f482ab41f3c50d2765c53db8b4e79f4e1b7903.tar.bz2
am ee2cfe48: Only call authenticate when we are not listening yet
* commit 'ee2cfe48d4fb36906c59c2ae545808dba01f90d8': Only call authenticate when we are not listening yet
Diffstat (limited to 'packages/Keyguard')
-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 eddee7b..f39acde 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) {