From ff129bbc632c4509ac825945fafc02b1a3bde053 Mon Sep 17 00:00:00 2001
From: josephjang <josephjang@google.com>
Date: Tue, 18 Aug 2020 13:08:14 +0800
Subject: [PATCH] LockSettingsService: Move down onAuthTokenKnownForUser()

onAuthTokenKnownForUser() will send secret to AuthSecret to install
Citadel FW update password. In order to prevent sending different
secret to Citadle in corner cases, leave onAuthTokenKnownForUser()
behind Synthetic password has been setup complete.

Bug: 150929955
Test: atest com.android.server.locksettings
Change-Id: I80baea9671b050c1d83618076ff7ae2f26dde613
Merged-In: I80baea9671b050c1d83618076ff7ae2f26dde613
---
 .../com/android/server/locksettings/LockSettingsService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 90370ddd21dd3..69b02ceb24111 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 @@ 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;
     }