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

Commit 05d11443 authored by lijilou's avatar lijilou Committed by Jilou li
Browse files

BiometricScheduler: fix the NPE problem in startWatchdog method. 

Binder thread call the startWatchdog,but another put the  mCurrentOperation to null when when assigning value to the operation object.This may cause NPE problems.

Test: OEM monkey test
Flag: EXEMPT bugfix
Bug: 379003855
Change-Id: Ib44e3214c891dc4e975d34e1c4213faea14131c6
parent ad54f58a

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