Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e26c387 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Use Fingerprint/FaceManager from injector"

parents afe2b1bb 8148d943

services/core/java/com/android/server/locksettings/BiometricDeferredQueue.java

+4 −3
Original line number Diff line number Diff line
@@ -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;

    }



    /**

services/core/java/com/android/server/locksettings/LockSettingsService.java

+2 −1
Original line number Diff line number Diff line
@@ -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() {