Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cancel acquisition client in scheduler" into udc-d1-dev am: aef8ccbfdc am: 24d3e44fa6

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

Change-Id: Ibee29777c2fa3464e9cdbce6260f280f0a626080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2023-06-14 17:59:26 +00:00
committed by Automerger Merge Worker
parent 745830ec0f 24d3e44fa6
commit 2e887ef92f
3 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java
View File

@@ -210,4 +210,8 @@ public abstract class AcquisitionClient<T> extends HalClientMonitor<T> implement
public boolean isInterruptable() {
return true;
}
public boolean isAlreadyCancelled() {
return mAlreadyCancelled;
}
}

8
services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
View File

@@ -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 */);

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

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