From 8148d94328c631ac153539009811a8a2e3379b2c Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Mon, 17 Aug 2020 10:43:12 -0700
Subject: [PATCH] Use Fingerprint/FaceManager from injector

Bug: 145978626

Test: Reset lockout for fingerprint/face
Change-Id: I2f278766d64e4d5586a552d2458ce75c25b53a99
---
 .../server/locksettings/BiometricDeferredQueue.java        | 7 ++++---
 .../android/server/locksettings/LockSettingsService.java   | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/locksettings/BiometricDeferredQueue.java b/services/core/java/com/android/server/locksettings/BiometricDeferredQueue.java
index 5573eede0d40e..e3074dba26ef9 100644
--- a/services/core/java/com/android/server/locksettings/BiometricDeferredQueue.java
+++ b/services/core/java/com/android/server/locksettings/BiometricDeferredQueue.java
@@ -164,9 +164,10 @@ public class BiometricDeferredQueue {
         mPendingResetLockouts = new ArrayList<>();
     }
 
-    public void systemReady() {
-        mFingerprintManager = mContext.getSystemService(FingerprintManager.class);
-        mFaceManager = mContext.getSystemService(FaceManager.class);
+    public void systemReady(@Nullable FingerprintManager fingerprintManager,
+            @Nullable FaceManager faceManager) {
+        mFingerprintManager = fingerprintManager;
+        mFaceManager = faceManager;
     }
 
     /**
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 6eaa5faac8cba..0044d8936841d 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -804,7 +804,8 @@ public class LockSettingsService extends ILockSettings.Stub {
         mRebootEscrowManager.loadRebootEscrowDataIfAvailable();
         // TODO: maybe skip this for split system user mode.
         mStorage.prefetchUser(UserHandle.USER_SYSTEM);
-        mBiometricDeferredQueue.systemReady();
+        mBiometricDeferredQueue.systemReady(mInjector.getFingerprintManager(),
+                mInjector.getFaceManager());
     }
 
     private void getAuthSecretHal() {