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

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

Merge changes from topic "lockoutreset" into rvc-dev 

* changes:
  Add missing permission check for addLockoutResetCallback
  Add null pointer check for addLockoutResetCallback
parents 04e5ed52 932fd9bd

services/core/java/com/android/server/biometrics/BiometricServiceBase.java

+4 −0
Original line number Diff line number Diff line
@@ -978,6 +978,10 @@ public abstract class BiometricServiceBase extends SystemService 
    }



    protected void addLockoutResetCallback(IBiometricServiceLockoutResetCallback callback) {

        if (callback == null) {

            Slog.w(getTag(), "Null LockoutResetCallback");

            return;

        }

        mHandler.post(() -> {

           final LockoutResetMonitor monitor = new LockoutResetMonitor(callback);

           if (!mLockoutMonitors.contains(monitor)) {

services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ public class FingerprintService extends BiometricServiceBase { 
        @Override

        public void addLockoutResetCallback(final IBiometricServiceLockoutResetCallback callback)

                throws RemoteException {

            checkPermission(USE_BIOMETRIC_INTERNAL);

            FingerprintService.super.addLockoutResetCallback(callback);

        }