Merge "BiometricScheduler: fix the NPE problem in startWatchdog method." into main (eaba7be2) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -677,10 +677,11 @@ public class BiometricScheduler<T, U> {
		* Start the timeout for the watchdog.
		*/
		public void startWatchdog() {
		if (mCurrentOperation == null) {
		final BiometricSchedulerOperation operation = mCurrentOperation;
		if (operation == null) {
		Slog.e(TAG, "Current operation is null,no need to start watchdog");
		return;
		}
		final BiometricSchedulerOperation operation = mCurrentOperation;
		mHandler.postDelayed(() -> {
		if (operation == mCurrentOperation && !operation.isFinished()) {
		Counter.logIncrement("biometric.value_scheduler_watchdog_triggered_count");