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

Commit 9b76180a authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Cancel acquisition client in scheduler" into udc-d1-dev am: aef8ccbf... 

Merge "Cancel acquisition client in scheduler" into udc-d1-dev am: aef8ccbf am: 24d3e44f am: 2e887ef9

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



Change-Id: I6094ad96036c5971d0a87515d5aff27bd6108e7b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 951dff80 2e887ef9

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

+4 −0
Original line number Diff line number Diff line
@@ -210,4 +210,8 @@ public abstract class AcquisitionClient<T> extends HalClientMonitor<T> implement 
    public boolean isInterruptable() {

        return true;

    }



    public boolean isAlreadyCancelled() {

        return mAlreadyCancelled;

    }

}

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

+8 −0
Original line number Diff line number Diff line
@@ -268,6 +268,14 @@ public class BiometricScheduler { 
            return;

        }



        if (mCurrentOperation.isAcquisitionOperation()) {

            AcquisitionClient client = (AcquisitionClient) mCurrentOperation.getClientMonitor();

            if (client.isAlreadyCancelled()) {

                mCurrentOperation.cancel(mHandler, mInternalCallback);

                return;

            }

        }



        if (mGestureAvailabilityDispatcher != null && mCurrentOperation.isAcquisitionOperation()) {

            mGestureAvailabilityDispatcher.markSensorActive(

                    mCurrentOperation.getSensorId(), true /* active */);

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

+55 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.server.biometrics.sensors; 
import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_ERROR_CANCELED;

import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_SUCCESS;



import static com.google.common.truth.Truth.assertThat;



import static junit.framework.Assert.assertTrue;

import static junit.framework.Assert.fail;
@@ -405,6 +407,59 @@ public class BiometricSchedulerTest { 
        testCancelsEnrollWhenRequestId(10L, 20, false /* started */);

    }



    @Test

    public void testCancelAuthenticationClientWithoutStarting() {

        final Supplier<Object> lazyDaemon = () -> mock(Object.class);

        final TestHalClientMonitor client1 = new TestHalClientMonitor(mContext, mToken, lazyDaemon);

        final ClientMonitorCallbackConverter callback = mock(ClientMonitorCallbackConverter.class);

        final TestAuthenticationClient client2 = new TestAuthenticationClient(mContext, lazyDaemon,

                mToken, callback, mBiometricContext);



        //Schedule authentication client to the pending queue

        mScheduler.scheduleClientMonitor(client1);

        mScheduler.scheduleClientMonitor(client2);

        waitForIdle();



        assertThat(mScheduler.getCurrentClient()).isEqualTo(client1);



        client2.cancel();

        waitForIdle();



        assertThat(client2.isAlreadyCancelled()).isTrue();



        client1.getCallback().onClientFinished(client1, false);

        waitForIdle();



        assertThat(mScheduler.getCurrentClient()).isNull();

    }



    @Test

    public void testCancelAuthenticationClientWithoutStarting_whenAppCrashes() {

        final Supplier<Object> lazyDaemon = () -> mock(Object.class);

        final TestHalClientMonitor client1 = new TestHalClientMonitor(mContext, mToken, lazyDaemon);

        final ClientMonitorCallbackConverter callback = mock(ClientMonitorCallbackConverter.class);

        final TestAuthenticationClient client2 = new TestAuthenticationClient(mContext, lazyDaemon,

                mToken, callback, mBiometricContext);



        //Schedule authentication client to the pending queue

        mScheduler.scheduleClientMonitor(client1);

        mScheduler.scheduleClientMonitor(client2);

        waitForIdle();



        assertThat(mScheduler.getCurrentClient()).isEqualTo(client1);



        //App crashes

        client2.binderDied();

        waitForIdle();



        assertThat(client2.isAlreadyCancelled()).isTrue();



        client1.getCallback().onClientFinished(client1, false);

        waitForIdle();



        assertThat(mScheduler.getCurrentClient()).isNull();

    }



    private void testCancelsEnrollWhenRequestId(@Nullable Long requestId, long cancelRequestId,

            boolean started) {

        final Supplier<Object> lazyDaemon = () -> mock(Object.class);