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

Commit 818a03bc authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "ResetLockoutClients cancel preceding clients." into tm-dev am: fa8e422f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309972



Change-Id: Ie82f75199dc11d8b39a8587787ae57bbd1ee1b87
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4d5e638 fa8e422f

services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceResetLockoutClient.java

+4 −0
Original line number Diff line number Diff line
@@ -88,6 +88,10 @@ public class FaceResetLockoutClient extends HalClientMonitor<AidlSession> implem 
        mCallback.onClientFinished(this, true /* success */);

    }



    public boolean interruptsPrecedingClients() {

        return true;

    }



    /**

     * Reset the local lockout state and notify any listeners.

     *

services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceResetLockoutClient.java

+4 −0
Original line number Diff line number Diff line
@@ -65,6 +65,10 @@ public class FaceResetLockoutClient extends HalClientMonitor<IBiometricsFace> { 
        startHalOperation();

    }



    public boolean interruptsPrecedingClients() {

        return true;

    }



    @Override

    protected void startHalOperation() {

        try {

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ class FingerprintResetLockoutClient extends HalClientMonitor<AidlSession> implem 
        }

    }



    public boolean interruptsPrecedingClients() {

        return true;

    }



    void onLockoutCleared() {

        resetLocalLockoutStateToNone(getSensorId(), getTargetUserId(), mLockoutCache,

                mLockoutResetDispatcher);

services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintResetLockoutClient.java

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ public class FingerprintResetLockoutClient extends BaseClientMonitor { 
        callback.onClientFinished(this, true /* success */);

    }



    public boolean interruptsPrecedingClients() {

        return true;

    }



    @Override

    public int getProtoEnum() {

        return BiometricsProto.CM_RESET_LOCKOUT;