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

Merge "Fix biometric context update problem." into udc-dev

Browse Source
This commit is contained in:
Yong Zhang
2023-08-04 22:06:01 +00:00
committed by Android (Google) Code Review
parent 42c4093fa1 a7c50568f6
commit 656f5d512f
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java
View File

@@ -216,6 +216,10 @@ public final class BiometricContextProvider implements BiometricContext {
public void subscribe(@NonNull OperationContextExt context, public void subscribe(@NonNull OperationContextExt context,
@NonNull Consumer<OperationContext> consumer) { @NonNull Consumer<OperationContext> consumer) {
mSubscribers.put(context, consumer); mSubscribers.put(context, consumer);
// TODO(b/294161627) Combine the getContext/subscribe APIs to avoid race
if (context.getDisplayState() != getDisplayState()) {
consumer.accept(context.update(this, context.isCrypto()).toAidlContext());
}
} }
@Override @Override

11
services/tests/servicestests/src/com/android/server/biometrics/log/BiometricContextProviderTest.java
View File

@@ -251,6 +251,14 @@ public class BiometricContextProviderTest {
assertThat(actual).containsExactly(true, false, true, true, false, false).inOrder(); assertThat(actual).containsExactly(true, false, true, true, false, false).inOrder();
} }
@Test
public void testSubscribesWithDifferentState() throws RemoteException {
final Consumer<OperationContext> nonEmptyConsumer = mock(Consumer.class);
mListener.onDisplayStateChanged(AuthenticateOptions.DISPLAY_STATE_AOD);
mProvider.subscribe(mOpContext, nonEmptyConsumer);
verify(nonEmptyConsumer).accept(same(mOpContext.toAidlContext()));
}
@Test @Test
public void testUnsubscribes() throws RemoteException { public void testUnsubscribes() throws RemoteException {
final Consumer<OperationContext> emptyConsumer = mock(Consumer.class); final Consumer<OperationContext> emptyConsumer = mock(Consumer.class);
@@ -259,6 +267,9 @@ public class BiometricContextProviderTest {
mListener.onDisplayStateChanged(AuthenticateOptions.DISPLAY_STATE_AOD); mListener.onDisplayStateChanged(AuthenticateOptions.DISPLAY_STATE_AOD);
//reset to unknown to avoid trigger accept when subscribe
mListener.onDisplayStateChanged(AuthenticateOptions.DISPLAY_STATE_UNKNOWN);
final Consumer<OperationContext> nonEmptyConsumer = mock(Consumer.class); final Consumer<OperationContext> nonEmptyConsumer = mock(Consumer.class);
mProvider.subscribe(mOpContext, nonEmptyConsumer); mProvider.subscribe(mOpContext, nonEmptyConsumer);
mListener.onDisplayStateChanged(AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN); mListener.onDisplayStateChanged(AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN);