commit 764f123b97b77bc818d1500eb6167b3e1bc3997b
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 20 23:36:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 20 23:36:37 2018 +0000
tree 96cce4b55d5a28ade5246e916650d67ae2e95ceb
parent 7eec8e9635d25bda48035db2e4fbb340ad226fa6
parent bab773d23ff8dedcf5a258362c4c603da63dafe5

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

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

diff --git a/core/java/android/service/trust/TrustAgentService.java b/core/java/android/service/trust/TrustAgentService.java
index 40e84b9..61277e2 100644
--- a/core/java/android/service/trust/TrustAgentService.java
+++ b/core/java/android/service/trust/TrustAgentService.java
@@ -545,7 +545,7 @@
      */
     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;
         }