commit 7e2e40e127f5b421f946427071a20d0e9d88ca03
author Adrian Roos <roosa@google.com> Fri Nov 21 15:27:12 2014 +0100
committer Adrian Roos <roosa@google.com> Fri Nov 21 15:27:12 2014 +0100
tree 7c45ac9c0dcc84d42ab48dcceed87a52407a1b3e
parent 0653f508b58eab994089ae2da783852a5c1b4a8a

Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045

Fix log spam and wrong log string.

Bug: 18414067
Change-Id: I588ec7b62055d2374d311d3adf9edd500ca40380

services/core/java/com/android/server/trust/TrustManagerService.java

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 @@
 
     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 @@
                     requireCredentialEntry(msg.arg1);
                     break;
                 case MSG_KEYGUARD_SHOWING_CHANGED:
-                    refreshDeviceLockedForUser(UserHandle.USER_CURRENT);
+                    refreshDeviceLockedForUser(mCurrentUser);
                     break;
                 case MSG_START_USER:
                 case MSG_CLEANUP_USER: