commit 91c70b63694436f5e6f82d75f64d9a35b54187d2
author Kevin Chyn <kchyn@google.com> Thu Jun 13 13:20:41 2019 -0700
committer Kevin Chyn <kchyn@google.com> Mon Jun 17 18:26:55 2019 -0700
tree 8a60590845918ee9a510ee3bde10298639d5be41
parent ad1aefd334b5570ad47c091d5eb3f23ccadeee58

Reset lockout for correct profile/user

Fixes: 135038672

Test: Lockout reset properly reset for all users when unified challenge
      is enabled
Change-Id: I61b851c41cd973a4d1c703366949cf25847675a4

services/core/java/com/android/server/locksettings/LockSettingsService.java

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 750a4de..433ce81 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -1290,6 +1290,7 @@
                 final BiometricManager bm = mContext.getSystemService(BiometricManager.class);
                 final PackageManager pm = mContext.getPackageManager();
                 for (int i = 0; i < resetLockouts.size(); i++) {
+                    bm.setActiveUser(resetLockouts.get(i).mUserId);
                     bm.resetLockout(resetLockouts.get(i).mHAT);
                 }
                 if (challengeType == CHALLENGE_INTERNAL