diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-18 19:32:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-18 19:32:01 +0000 |
| commit | 448216e7b8822ae9c1c44836482c95f2becc220d (patch) | |
| tree | fb01c74d6475b77d67a22093999ca4d7d1fff6df /services | |
| parent | 53c38c8819e2497f8272e7615d34aaa4ae052adf (diff) | |
| parent | deb050706c5964800461333881b48ebb7329c536 (diff) | |
| download | frameworks_base-448216e7b8822ae9c1c44836482c95f2becc220d.zip frameworks_base-448216e7b8822ae9c1c44836482c95f2becc220d.tar.gz frameworks_base-448216e7b8822ae9c1c44836482c95f2becc220d.tar.bz2 | |
Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/trust/TrustManagerService.java | 6 |
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); - } } } |