From 3a9a64cc10b4e976f5cd1a7b5626d5769e6f762f Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Tue, 23 Mar 2021 17:32:58 -0700
Subject: [PATCH] Ensure updateActiveUser is called before generateChallenge

generateChallenge may be invoked if the HAL crashes while the device
is on keyguard. Always schedule this for now. The updateActiveUser
client is already optimized to not invoke IBiometricsFace#setActiveUser
if we are already the target user.

Fixes: 172885666
Test: manual
Change-Id: I16f22ff3ffc18f031bc02c0cb37a3bc5fc591940
---
 .../com/android/server/biometrics/sensors/face/hidl/Face10.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java
index 50756c89613c0..79e361f531c7a 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java
@@ -528,6 +528,8 @@ public class Face10 implements IHwBinder.DeathRecipient, ServiceProvider {
                 }
             }
 
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
             final FaceGenerateChallengeClient client = new FaceGenerateChallengeClient(mContext,
                     mLazyDaemon, token, new ClientMonitorCallbackConverter(receiver), opPackageName,
                     mSensorId, mCurrentChallengeOwner);