Don't pass HardwareAuthToken to unlockUser() in non-SP verifyCredential

While at first glance it looks like this is still needed, actually the
support for HardwareAuthTokens was already removed from vold in Android
12, so this cannot actually be doing anything.

Test: atest com.android.server.locksettings
Bug: 184723544
Change-Id: I3c176ba282f4c7901dd09fe3d66cfd380794fb48
(cherry picked from commit 3654b097b1)
Merged-In: I3c176ba282f4c7901dd09fe3d66cfd380794fb48
This commit is contained in:
Eric Biggers
2022-01-26 01:59:15 +00:00
parent 0566abd58c
commit 665b5f9228

View File

@@ -2216,9 +2216,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);