summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-05-21 00:57:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-21 00:57:44 +0000
commit0a17fb4e562d5375f795ee1301c4aba86443e023 (patch)
tree184b52e90bc8974817e68d082a3948f2a60fafbc /packages
parenteff649862be8db389cf8480efa50ca1106dd2117 (diff)
parentbe67542182e41a6e31cf002db72ec42ee717bd1c (diff)
downloadframeworks_base-0a17fb4e562d5375f795ee1301c4aba86443e023.zip
frameworks_base-0a17fb4e562d5375f795ee1301c4aba86443e023.tar.gz
frameworks_base-0a17fb4e562d5375f795ee1301c4aba86443e023.tar.bz2
Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java4
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 5fece8d..5360645 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -361,9 +361,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
Log.d(TAG, "Fingerprint disabled by DPM for userId: " + userId);
return;
}
- if (groupId == userId) {
- onFingerprintAuthenticated(groupId);
- }
+ onFingerprintAuthenticated(userId);
} finally {
setFingerprintRunningDetectionRunning(false);
}