From 7e2e40e127f5b421f946427071a20d0e9d88ca03 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Fri, 21 Nov 2014 15:27:12 +0100
Subject: [PATCH] Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045

Fix log spam and wrong log string.

Bug: 18414067
Change-Id: I588ec7b62055d2374d311d3adf9edd500ca40380
---
 .../java/com/android/server/trust/TrustManagerService.java    | 4 ++--
 1 file 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 a2ea1c8a9bdef..cd1c9a5ec9d49 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: