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

Commit 67701fa3 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: Icd56688b2769fdca1aeabbefecec79dfa0d47cf2
parents 2f76c721 75369367

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

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