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

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

Merge "ResetLockout should be scheduled on FaceService's handler" into qt-r1-dev

parents 6293cba4 7a207e47
Loading
Loading
Loading
Loading
+13 −10
Original line number Diff line number Diff line
@@ -344,16 +344,19 @@ public class FaceService extends BiometricServiceBase {
        @Override // Binder call
        public int revokeChallenge(IBinder token) {
            checkPermission(MANAGE_BIOMETRIC);
            mHandler.post(() -> {
                // TODO(b/137106905): Schedule binder calls in FaceService to avoid deadlocks.
                if (getCurrentClient() == null) {
                // if we aren't handling any other HIDL calls (mCurrentClient == null), revoke the
                // challenge right away.
                return startRevokeChallenge(token);
                    // if we aren't handling any other HIDL calls (mCurrentClient == null), revoke
                    // the challenge right away.
                    startRevokeChallenge(token);
                } else {
                // postpone revoking the challenge until we finish processing the current HIDL call.
                    // postpone revoking the challenge until we finish processing the current HIDL
                    // call.
                    mRevokeChallengePending = true;
                return Status.OK;
                }
            });
            return Status.OK;
        }

        @Override // Binder call