Merge "Reset lockout for correct profile/user" into qt-r1-dev

2019-06-18 17:31:32 +00:00
parent c0ecccca16 91c70b6369
commit 8618ea96fd
1 changed files with 1 additions and 0 deletions
--- 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