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

Commit d559bd17 authored by Hongwei Wang's avatar Hongwei Wang Committed by android-build-merger
Browse files

Merge "Check if the given user is unlocked when unlock by token" into pi-dev 

am: 764f123b

Change-Id: I767426c2a920c448407ab799c4c7e77b54f6e461
parents 5b258f6d 764f123b

core/java/android/service/trust/TrustAgentService.java

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ public class TrustAgentService extends Service { 
     */

    public final void unlockUserWithToken(long handle, byte[] token, UserHandle user) {

        UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);

        if (um.isUserUnlocked()) {

        if (um.isUserUnlocked(user)) {

            Slog.i(TAG, "User already unlocked");

            return;

        }