From 665b5f9228c482c5d199731f9d891b0b62efa580 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 26 Jan 2022 01:59:15 +0000 Subject: [PATCH] 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 3654b097b179289fe41a7647dadf8404e72bbb87) Merged-In: I3c176ba282f4c7901dd09fe3d66cfd380794fb48 --- .../com/android/server/locksettings/LockSettingsService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 14597a743a56f..a1626696c7bec 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -2216,9 +2216,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);