summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-08-05 13:03:21 -0700
committerJim Miller <jaggies@google.com>2015-08-05 20:06:37 +0000
commit8ae1be120806d0189f65a492004a7b5416aa6c6f (patch)
treecb7d30ab1f82881d6b9b3ad5b0ce23be0d9564a2 /services
parent881cd15519535e493d497fefd857f8fe0236c774 (diff)
downloadframeworks_base-8ae1be120806d0189f65a492004a7b5416aa6c6f.zip
frameworks_base-8ae1be120806d0189f65a492004a7b5416aa6c6f.tar.gz
frameworks_base-8ae1be120806d0189f65a492004a7b5416aa6c6f.tar.bz2
Disable fingerprint when remotely reset by DPM
When the device is lost or stolen, it's safer to fall back to strong authentication (pin, pattern or password). This disables fingerprint like we do with trust agents. Fixes bug 21620081 Change-Id: I7bbe54be3721b2f160b783daeb3acbe434705046
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/trust/TrustManagerService.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index 15da829..174bf16 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -579,8 +579,14 @@ public class TrustManagerService extends SystemService {
private void clearUserHasAuthenticated(int userId) {
if (userId == UserHandle.USER_ALL) {
mUserHasAuthenticated.clear();
+ synchronized (mUserHasAuthenticatedSinceBoot) {
+ mUserHasAuthenticatedSinceBoot.clear();
+ }
} else {
mUserHasAuthenticated.put(userId, false);
+ synchronized (mUserHasAuthenticatedSinceBoot) {
+ mUserHasAuthenticatedSinceBoot.put(userId, false);
+ }
}
}