From 57ce2983cd62ddf23aad261b287d2e9d0c4a55d9 Mon Sep 17 00:00:00 2001
From: Rubin Xu <rubinxu@google.com>
Date: Fri, 18 Sep 2020 12:45:08 +0100
Subject: [PATCH] Generate auth token when unlocking from reboot escrow

Mint a fresh gatekeeper auth token when device is unlocked
by reboot escrow after taking OTA.

Bug: 168816765
Test: atest com.android.server.locksettings
Change-Id: I56bb1ce7c356062edefcc36f295dcf6178354d10
---
 .../com/android/server/locksettings/LockSettingsService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 1b43db2a421d7..52967ecddc7e4 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -3501,6 +3501,9 @@ public class LockSettingsService extends ILockSettings.Stub {
             SyntheticPasswordManager.AuthenticationToken
                     authToken = new SyntheticPasswordManager.AuthenticationToken(spVersion);
             authToken.recreateDirectly(syntheticPassword);
+            synchronized (mSpManager) {
+                mSpManager.verifyChallenge(getGateKeeperService(), authToken, 0L, userId);
+            }
             onCredentialVerified(authToken, loadPasswordMetrics(authToken, userId), userId);
         }
     }