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

Commit 41ac7f04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BiometricScheduler: fix the NPE problem in startWatchdog method." into... 

Merge "BiometricScheduler: fix the NPE problem in startWatchdog method." into main am: eaba7be2 am: 47d6e998

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3350406



Change-Id: I164caa989ac623cd3d990a86ad78ea1318f8e00b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29f50218 47d6e998

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");