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 am: 29bedbcd95 am: ba61ec7cb9

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

Change-Id: I3d7a7c7d9e86c5640ae0f85c3f2b63028f8dd311
This commit is contained in:
Jing-yan, Jang
2020-09-22 10:19:04 +00:00
committed by Automerger Merge Worker
parent 0f7f7b4882 ba61ec7cb9
commit bf10852aa2
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

@@ -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;
}