From 91c70b63694436f5e6f82d75f64d9a35b54187d2 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Thu, 13 Jun 2019 13:20:41 -0700
Subject: [PATCH] Reset lockout for correct profile/user

Fixes: 135038672

Test: Lockout reset properly reset for all users when unified challenge
      is enabled
Change-Id: I61b851c41cd973a4d1c703366949cf25847675a4
---
 .../com/android/server/locksettings/LockSettingsService.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 750a4deffc63e..433ce811c8d7e 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 @@ public class LockSettingsService extends ILockSettings.Stub {
                 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