Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jing-yan, Jang
2020-09-22 09:43:03 +00:00
committed by Android (Google) Code Review
parent 8ca51bde8c ff129bbc63
commit 29bedbcd95
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -2620,7 +2620,6 @@ public class LockSettingsService extends ILockSettings.Stub {
Slog.i(TAG, "Initialize SyntheticPassword for user: " + userId); Slog.i(TAG, "Initialize SyntheticPassword for user: " + userId);
final AuthenticationToken auth = mSpManager.newSyntheticPasswordAndSid( final AuthenticationToken auth = mSpManager.newSyntheticPasswordAndSid(
getGateKeeperService(), credentialHash, credential, userId); getGateKeeperService(), credentialHash, credential, userId);
onAuthTokenKnownForUser(userId, auth);
if (auth == null) { if (auth == null) {
Slog.wtf(TAG, "initializeSyntheticPasswordLocked returns null auth token"); Slog.wtf(TAG, "initializeSyntheticPasswordLocked returns null auth token");
return null; return null;
@@ -2643,6 +2642,7 @@ public class LockSettingsService extends ILockSettings.Stub {
} }
fixateNewestUserKeyAuth(userId); fixateNewestUserKeyAuth(userId);
setSyntheticPasswordHandleLocked(handle, userId); setSyntheticPasswordHandleLocked(handle, userId);
onAuthTokenKnownForUser(userId, auth);
return auth; return auth;
} }