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

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

Merge "LockSettingsService: Move down onAuthTokenKnownForUser()" into... 

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

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

Change-Id: I3d7a7c7d9e86c5640ae0f85c3f2b63028f8dd311
parents 0f7f7b48 ba61ec7c

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

+1 −1
Original line number Diff line number Diff line
@@ -2616,7 +2616,6 @@ public class LockSettingsService extends ILockSettings.Stub { 


        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;
@@ -2639,6 +2638,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
        }

        fixateNewestUserKeyAuth(userId);

        setSyntheticPasswordHandleLocked(handle, userId);

        onAuthTokenKnownForUser(userId, auth);

        return auth;

    }