Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b4b2940 authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

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

* commit '07361c84':
  Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
parents 520d20c1 07361c84

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

+2 −2
Original line number Diff line number Diff line
@@ -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: