Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't pass HardwareAuthToken to unlockUser() in non-SP verifyCredential am: 665b5f9228

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021757

Change-Id: I726c8faa05107c17dbf4ec0ff9349dbb5416d286
This commit is contained in:
Eric Biggers
2022-03-15 22:12:05 +00:00
committed by Automerger Merge Worker
parent e024ab7105 665b5f9228
commit 753693671d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -2212,9 +2212,8 @@ public class LockSettingsService extends ILockSettings.Stub {
setUserPasswordMetrics(credential, userId); setUserPasswordMetrics(credential, userId);
unlockKeystore(credential.getCredential(), userId); unlockKeystore(credential.getCredential(), userId);
Slog.i(TAG, "Unlocking user " + userId + " with token length " Slog.i(TAG, "Unlocking user " + userId);
+ response.getGatekeeperHAT().length); unlockUser(userId, null, secretFromCredential(credential));
unlockUser(userId, response.getGatekeeperHAT(), secretFromCredential(credential));
if (isManagedProfileWithSeparatedLock(userId)) { if (isManagedProfileWithSeparatedLock(userId)) {
setDeviceUnlockedForUser(userId); setDeviceUnlockedForUser(userId);