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

Commit b04b3606 authored by Joshua McCloskey's avatar Joshua McCloskey Committed by Joshua Mccloskey
Browse files

ResetLockoutClients cancel preceding clients.

Test: Verified manually via authenticating with multi biometrics.
Fixes: 232005953
Fixes: 232006956
Change-Id: I959f7e18be5bc29439472726a6b1ba409dc60845
parent 5815b882
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -88,6 +88,10 @@ public class FaceResetLockoutClient extends HalClientMonitor<AidlSession> implem
        mCallback.onClientFinished(this, true /* success */);
        mCallback.onClientFinished(this, true /* success */);
    }
    }


    public boolean interruptsPrecedingClients() {
        return true;
    }

    /**
    /**
     * Reset the local lockout state and notify any listeners.
     * Reset the local lockout state and notify any listeners.
     *
     *
+4 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,10 @@ public class FaceResetLockoutClient extends HalClientMonitor<IBiometricsFace> {
        startHalOperation();
        startHalOperation();
    }
    }


    public boolean interruptsPrecedingClients() {
        return true;
    }

    @Override
    @Override
    protected void startHalOperation() {
    protected void startHalOperation() {
        try {
        try {
+4 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,10 @@ class FingerprintResetLockoutClient extends HalClientMonitor<AidlSession> implem
        }
        }
    }
    }


    public boolean interruptsPrecedingClients() {
        return true;
    }

    void onLockoutCleared() {
    void onLockoutCleared() {
        resetLocalLockoutStateToNone(getSensorId(), getTargetUserId(), mLockoutCache,
        resetLocalLockoutStateToNone(getSensorId(), getTargetUserId(), mLockoutCache,
                mLockoutResetDispatcher);
                mLockoutResetDispatcher);
+4 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,10 @@ public class FingerprintResetLockoutClient extends BaseClientMonitor {
        callback.onClientFinished(this, true /* success */);
        callback.onClientFinished(this, true /* success */);
    }
    }


    public boolean interruptsPrecedingClients() {
        return true;
    }

    @Override
    @Override
    public int getProtoEnum() {
    public int getProtoEnum() {
        return BiometricsProto.CM_RESET_LOCKOUT;
        return BiometricsProto.CM_RESET_LOCKOUT;