commit 29bedbcd95d31919d652f7446e87ad38dcf352c7
author Jing-yan, Jang <josephjang@google.com> Tue Sep 22 09:43:03 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 22 09:43:03 2020 +0000
tree 8cf38fdbad02b60b72205683809b59f76d8af006
parent 8ca51bde8cce5a1bed688ae4f3a994e436dcf494
parent ff129bbc632c4509ac825945fafc02b1a3bde053

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

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

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 90370dd..69b02ce 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -2620,7 +2620,6 @@
         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 @@
         }
         fixateNewestUserKeyAuth(userId);
         setSyntheticPasswordHandleLocked(handle, userId);
+        onAuthTokenKnownForUser(userId, auth);
         return auth;
     }