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 am: 753693671d

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

Change-Id: Icd56688b2769fdca1aeabbefecec79dfa0d47cf2
This commit is contained in:
Eric Biggers
2022-03-15 22:41:13 +00:00
committed by Automerger Merge Worker
parent 2f76c72161 753693671d
commit 67701fa376
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);
unlockKeystore(credential.getCredential(), userId);
Slog.i(TAG, "Unlocking user " + userId + " with token length "
+ response.getGatekeeperHAT().length);
unlockUser(userId, response.getGatekeeperHAT(), secretFromCredential(credential));
Slog.i(TAG, "Unlocking user " + userId);
unlockUser(userId, null, secretFromCredential(credential));
if (isManagedProfileWithSeparatedLock(userId)) {
setDeviceUnlockedForUser(userId);