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

2018-03-20 23:36:37 +00:00
parent 7eec8e9635 bab773d23f
commit 764f123b97
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/service/trust/TrustAgentService.java
+++ b/core/java/android/service/trust/TrustAgentService.java
@@ -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;
        }