Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9b4b2940: am 07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev

Browse Source 
* commit '9b4b2940b7697e626200a7ab82fbfa3bf99174fc':
  Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
This commit is contained in:
Adrian Roos
2014-11-25 15:09:33 +00:00
committed by Android Git Automerger
parent 9a4d0257be 9b4b2940b7
commit df3be538e0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/trust/TrustManagerService.java
View File

@@ -294,7 +294,7 @@ public class TrustManagerService extends SystemService {
private void refreshDeviceLockedForUser(int userId) { private void refreshDeviceLockedForUser(int userId) {
if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_OWNER) { 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")); + " must be USER_ALL or a specific user.", new Throwable("here"));
userId = UserHandle.USER_ALL; userId = UserHandle.USER_ALL;
} }
@@ -810,7 +810,7 @@ public class TrustManagerService extends SystemService {
requireCredentialEntry(msg.arg1); requireCredentialEntry(msg.arg1);
break; break;
case MSG_KEYGUARD_SHOWING_CHANGED: case MSG_KEYGUARD_SHOWING_CHANGED:
refreshDeviceLockedForUser(UserHandle.USER_CURRENT); refreshDeviceLockedForUser(mCurrentUser);
break; break;
case MSG_START_USER: case MSG_START_USER:
case MSG_CLEANUP_USER: case MSG_CLEANUP_USER: