From bab773d23ff8dedcf5a258362c4c603da63dafe5 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Mon, 19 Mar 2018 10:56:44 -0700
Subject: [PATCH] Check if the given user is unlocked when unlock by token

Bug: 76010226
Test: None

Change-Id: I2ceea0f185c5e54a9c2a529a9cf8db78587c4072
---
 core/java/android/service/trust/TrustAgentService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/service/trust/TrustAgentService.java b/core/java/android/service/trust/TrustAgentService.java
index 40e84b9604e7b..61277e285b862 100644
--- 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;
         }