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

Commit ba61ec7c authored by Jing-yan, Jang's avatar Jing-yan, Jang Committed by Automerger Merge Worker
Browse files

Merge "LockSettingsService: Move down onAuthTokenKnownForUser()" into rvc-qpr-dev am: 29bedbcd 

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

Change-Id: Ifca958847a60c77deab947370be970225eb21907
parents 6f33def8 29bedbcd

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

+1 −1
Original line number Diff line number Diff line
@@ -2620,7 +2620,6 @@ public class LockSettingsService extends ILockSettings.Stub { 
        Slog.i(TAG, "Initialize SyntheticPassword for user: " + userId);

        final AuthenticationToken auth = mSpManager.newSyntheticPasswordAndSid(

                getGateKeeperService(), credentialHash, credential, userId);

        onAuthTokenKnownForUser(userId, auth);

        if (auth == null) {

            Slog.wtf(TAG, "initializeSyntheticPasswordLocked returns null auth token");

            return null;
@@ -2643,6 +2642,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
        }

        fixateNewestUserKeyAuth(userId);

        setSyntheticPasswordHandleLocked(handle, userId);

        onAuthTokenKnownForUser(userId, auth);

        return auth;

    }