Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use Fingerprint/FaceManager from injector"

Browse Source
This commit is contained in:
Kevin Chyn
2020-08-17 20:09:42 +00:00
committed by Android (Google) Code Review
parent afe2b1bb40 8148d94328
commit 9e26c387d5
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/locksettings/BiometricDeferredQueue.java
View File

@@ -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;
}
/**

3
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -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() {