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

Commit 1e40a6c1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "BiometricService: put the mthod of resetLockoutFor into handler when...

Merge "BiometricService: put the mthod of resetLockoutFor into handler when binder called and keep thread-safe in RingBuffer." into main
parents 71718190 babdfbcb
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -848,8 +848,10 @@ public class BiometricService extends SystemService {

            Slog.d(TAG, "resetLockout(userId=" + userId
                    + ", hat=" + (hardwareAuthToken == null ? "null " : "present") + ")");
            mHandler.post(() -> {
                mBiometricContext.getAuthSessionCoordinator()
                    .resetLockoutFor(userId, Authenticators.BIOMETRIC_STRONG, -1);
            });
        }

        @android.annotation.EnforcePermission(android.Manifest.permission.USE_BIOMETRIC_INTERNAL)
+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class AuthSessionCoordinator implements AuthSessionListener {
            mApiCallNumber = 0;
        }

        void addApiCall(String str) {
        synchronized void addApiCall(String str) {
            mApiCalls[mCurr] = str;
            mCurr++;
            mCurr %= mSize;
@@ -243,7 +243,7 @@ public class AuthSessionCoordinator implements AuthSessionListener {
        }

        @Override
        public String toString() {
        public synchronized String toString() {
            String buffer = "";
            int apiCall = mApiCallNumber > mSize ? mApiCallNumber - mSize : 0;
            for (int i = 0; i < mSize; i++) {