summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-08-17 23:30:35 +0000
committerJim Miller <jaggies@google.com>2015-08-17 23:33:39 +0000
commitdeb050706c5964800461333881b48ebb7329c536 (patch)
treeb8111a2304b9e3dd8fe9fe53d39ee94efae6159e /services
parent8ae1be120806d0189f65a492004a7b5416aa6c6f (diff)
downloadframeworks_base-deb050706c5964800461333881b48ebb7329c536.zip
frameworks_base-deb050706c5964800461333881b48ebb7329c536.tar.gz
frameworks_base-deb050706c5964800461333881b48ebb7329c536.tar.bz2
Revert "Disable fingerprint when remotely reset by DPM"
This reverts commit 8ae1be120806d0189f65a492004a7b5416aa6c6f. Fixes bug 23187090 Change-Id: Idd9798895b08618f7d272b818818a45d3c9dc7d2
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/trust/TrustManagerService.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index 174bf16..15da829 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -579,14 +579,8 @@ 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);
- }
}
}