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

Commit 0b410e95 authored by Diya Bera's avatar Diya Bera
Browse files

Do not return false if operation has already started 

Fixes: 362761034
Test: atest BiometricSchedulerOperationTest
Flag: EXEMPT Bug Fix
Change-Id: I544ec6f4af087e928664b23cd0ed763a22e22991
parent e07636be

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

+6 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public class BiometricSchedulerOperation { 
                STATE_WAITING_IN_QUEUE,

                STATE_WAITING_FOR_COOKIE,

                STATE_WAITING_IN_QUEUE_CANCELING)) {

            return false;

            return hasOperationAlreadyStarted();

        }



        if (mClientMonitor.getCookie() != 0) {
@@ -191,7 +191,7 @@ public class BiometricSchedulerOperation { 
                STATE_WAITING_IN_QUEUE,

                STATE_WAITING_FOR_COOKIE,

                STATE_WAITING_IN_QUEUE_CANCELING)) {

            return false;

            return hasOperationAlreadyStarted();

        }



        return doStart(callback);
@@ -230,6 +230,10 @@ public class BiometricSchedulerOperation { 
        return true;

    }



    private boolean hasOperationAlreadyStarted() {

        return mState == STATE_STARTED;

    }



    /**

     * Abort a pending operation.

     *

services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerOperationTest.java

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class BiometricSchedulerOperationTest { 
        when(mInterruptableClientMonitor.getFreshDaemon()).thenReturn(mHal);



        assertThat(mInterruptableOperation.startWithCookie(mOnStartCallback, cookie)).isTrue();

        assertThat(mInterruptableOperation.startWithCookie(mOnStartCallback, cookie)).isFalse();

        assertThat(mInterruptableOperation.startWithCookie(mOnStartCallback, cookie)).isTrue();

    }



    @Test
@@ -201,7 +201,7 @@ public class BiometricSchedulerOperationTest { 
        when(mInterruptableClientMonitor.getFreshDaemon()).thenReturn(mHal);



        assertThat(mInterruptableOperation.start(mOnStartCallback)).isTrue();

        assertThat(mInterruptableOperation.start(mOnStartCallback)).isFalse();

        assertThat(mInterruptableOperation.start(mOnStartCallback)).isTrue();

    }



    @Test