diff options
| author | Adrian Roos <roosa@google.com> | 2014-11-24 16:03:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-24 16:03:43 +0000 |
| commit | 07361c8488aa600573c21e27f728c22d44760ecf (patch) | |
| tree | c74160bd565da1775655985717e72c6308a25004 /services | |
| parent | 702d9e31b1bcacff975a2b8e0d04160bbd6811ed (diff) | |
| parent | 7e2e40e127f5b421f946427071a20d0e9d88ca03 (diff) | |
| download | frameworks_base-07361c8488aa600573c21e27f728c22d44760ecf.zip frameworks_base-07361c8488aa600573c21e27f728c22d44760ecf.tar.gz frameworks_base-07361c8488aa600573c21e27f728c22d44760ecf.tar.bz2 | |
Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/trust/TrustManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index a2ea1c8..cd1c9a5 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -294,7 +294,7 @@ public class TrustManagerService extends SystemService { private void refreshDeviceLockedForUser(int userId) { if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_OWNER) { - Log.e(TAG, "refreshAgentList(userId=" + userId + "): Invalid user handle," + Log.e(TAG, "refreshDeviceLockedForUser(userId=" + userId + "): Invalid user handle," + " must be USER_ALL or a specific user.", new Throwable("here")); userId = UserHandle.USER_ALL; } @@ -810,7 +810,7 @@ public class TrustManagerService extends SystemService { requireCredentialEntry(msg.arg1); break; case MSG_KEYGUARD_SHOWING_CHANGED: - refreshDeviceLockedForUser(UserHandle.USER_CURRENT); + refreshDeviceLockedForUser(mCurrentUser); break; case MSG_START_USER: case MSG_CLEANUP_USER: |