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

Commit 38911fd6 authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Mark cancel when client is interruptable" into udc-dev am: adce2aea am: a791b31a

parents 969702c5 a791b31a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ public class BiometricScheduler {
        for (BiometricSchedulerOperation pendingOperation : mPendingOperations) {
            Slog.d(getTag(), "[Watchdog cancelling pending] "
                    + pendingOperation.getClientMonitor());
            pendingOperation.markCanceling();
            pendingOperation.markCancelingForWatchdog();
        }
        Slog.d(getTag(), "[Watchdog cancelling current] "
                + mCurrentOperation.getClientMonitor());
+5 −1
Original line number Diff line number Diff line
@@ -267,13 +267,17 @@ public class BiometricSchedulerOperation {

    /** Flags this operation as canceled, if possible, but does not cancel it until started. */
    public boolean markCanceling() {
        if (mState == STATE_WAITING_IN_QUEUE) {
        if (mState == STATE_WAITING_IN_QUEUE && isInterruptable()) {
            mState = STATE_WAITING_IN_QUEUE_CANCELING;
            return true;
        }
        return false;
    }

    @VisibleForTesting void markCancelingForWatchdog() {
        mState = STATE_WAITING_IN_QUEUE_CANCELING;
    }

    /**
     * Cancel the operation now.
     *
+184 −153

File changed.

Preview size limit exceeded, changes collapsed.