Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 665b5f92 authored by Eric Biggers's avatar Eric Biggers
Browse files

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 3654b097)
Merged-In: I3c176ba282f4c7901dd09fe3d66cfd380794fb48
parent 0566abd5

services/core/java/com/android/server/locksettings/LockSettingsService.java

+2 −3
Original line number Diff line number Diff line
@@ -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);