Merge "Mark cancel when client is interruptable" into udc-dev (adce2aea) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java

+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.