From c05df41a4114ec6d03595d557cf5d7f8e4294b16 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 7 Feb 2022 16:10:14 -0800 Subject: [PATCH] Rename AoD to Aod Bug: 205915651 Test: atest FrameworksServicesTests:com.android.server.biometrics Test: atest CtsBiometricsTestCases Change-Id: Id399cd701d697d6862205a2375b6d8dc53db551c --- .../biometrics/log/BiometricContext.java | 2 +- .../log/BiometricContextProvider.java | 6 +++--- .../log/BiometricFrameworkStatsLogger.java | 6 +++--- .../aidl/FingerprintAuthenticationClient.java | 2 +- .../aidl/FingerprintEnrollClient.java | 2 +- .../log/BiometricContextProviderTest.java | 20 +++++++++---------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/services/core/java/com/android/server/biometrics/log/BiometricContext.java b/services/core/java/com/android/server/biometrics/log/BiometricContext.java index c5e266f87149f..c86a8cb2c39de 100644 --- a/services/core/java/com/android/server/biometrics/log/BiometricContext.java +++ b/services/core/java/com/android/server/biometrics/log/BiometricContext.java @@ -44,7 +44,7 @@ public interface BiometricContext { @Nullable Integer getBiometricPromptSessionId(); /** If the display is in AOD. */ - boolean isAoD(); + boolean isAod(); /** * Subscribe to context changes. diff --git a/services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java b/services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java index 70acaff05e304..9d2fde72ea2ed 100644 --- a/services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java +++ b/services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java @@ -120,7 +120,7 @@ class BiometricContextProvider implements BiometricContext { @Override public OperationContext updateContext(@NonNull OperationContext operationContext, boolean isCryptoOperation) { - operationContext.isAoD = isAoD(); + operationContext.isAod = isAod(); operationContext.isCrypto = isCryptoOperation; setFirstSessionId(operationContext); return operationContext; @@ -160,7 +160,7 @@ class BiometricContextProvider implements BiometricContext { } @Override - public boolean isAoD() { + public boolean isAod() { return mIsDozing && mAmbientDisplayConfiguration.alwaysOnEnabled(UserHandle.USER_CURRENT); } @@ -177,7 +177,7 @@ class BiometricContextProvider implements BiometricContext { private void notifySubscribers() { mSubscribers.forEach((context, consumer) -> { - context.isAoD = isAoD(); + context.isAod = isAod(); consumer.accept(context); }); } diff --git a/services/core/java/com/android/server/biometrics/log/BiometricFrameworkStatsLogger.java b/services/core/java/com/android/server/biometrics/log/BiometricFrameworkStatsLogger.java index 8965227a1bb4c..d6ca8a68145e8 100644 --- a/services/core/java/com/android/server/biometrics/log/BiometricFrameworkStatsLogger.java +++ b/services/core/java/com/android/server/biometrics/log/BiometricFrameworkStatsLogger.java @@ -56,7 +56,7 @@ public class BiometricFrameworkStatsLogger { -1 /* sensorId */, operationContext.id, sessionType(operationContext.reason), - operationContext.isAoD); + operationContext.isAod); } /** {@see FrameworkStatsLog.BIOMETRIC_AUTHENTICATED}. */ @@ -77,7 +77,7 @@ public class BiometricFrameworkStatsLogger { ambientLightLux, operationContext.id, sessionType(operationContext.reason), - operationContext.isAoD); + operationContext.isAod); } /** {@see FrameworkStatsLog.BIOMETRIC_ENROLLED}. */ @@ -109,7 +109,7 @@ public class BiometricFrameworkStatsLogger { -1 /* sensorId */, operationContext.id, sessionType(operationContext.reason), - operationContext.isAoD); + operationContext.isAod); } /** {@see FrameworkStatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED}. */ diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java index d26a780085298..653776b3ca65d 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java @@ -229,7 +229,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient context.y = y; context.minor = minor; context.major = major; - context.isAoD = getBiometricContext().isAoD(); + context.isAod = getBiometricContext().isAod(); session.getSession().onPointerDownWithContext(context); } else { session.getSession().onPointerDown(0 /* pointerId */, x, y, minor, major); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java index e21d901b135dc..c92d599d68e68 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java @@ -213,7 +213,7 @@ class FingerprintEnrollClient extends EnrollClient implements Udfps context.y = y; context.minor = minor; context.major = major; - context.isAoD = getBiometricContext().isAoD(); + context.isAod = getBiometricContext().isAod(); session.getSession().onPointerDownWithContext(context); } else { session.getSession().onPointerDown(0 /* pointerId */, x, y, minor, major); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/log/BiometricContextProviderTest.java b/services/tests/servicestests/src/com/android/server/biometrics/log/BiometricContextProviderTest.java index 5746f6f2d446b..e6acc904d8112 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/log/BiometricContextProviderTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/log/BiometricContextProviderTest.java @@ -88,27 +88,27 @@ public class BiometricContextProviderTest { } @Test - public void testIsAoD() throws RemoteException { + public void testIsAod() throws RemoteException { mListener.onDozeChanged(true); - assertThat(mProvider.isAoD()).isTrue(); + assertThat(mProvider.isAod()).isTrue(); mListener.onDozeChanged(false); - assertThat(mProvider.isAoD()).isFalse(); + assertThat(mProvider.isAod()).isFalse(); when(mAmbientDisplayConfiguration.alwaysOnEnabled(anyInt())).thenReturn(false); mListener.onDozeChanged(true); - assertThat(mProvider.isAoD()).isFalse(); + assertThat(mProvider.isAod()).isFalse(); mListener.onDozeChanged(false); - assertThat(mProvider.isAoD()).isFalse(); + assertThat(mProvider.isAod()).isFalse(); } @Test - public void testSubscribesToAoD() throws RemoteException { + public void testSubscribesToAod() throws RemoteException { final List expected = ImmutableList.of(true, false, true, true, false); final List actual = new ArrayList<>(); mProvider.subscribe(mOpContext, ctx -> { assertThat(ctx).isSameInstanceAs(mOpContext); - actual.add(ctx.isAoD); + actual.add(ctx.isAod); }); for (boolean v : expected) { @@ -178,7 +178,7 @@ public class BiometricContextProviderTest { assertThat(context).isSameInstanceAs(mOpContext); assertThat(mOpContext.id).isEqualTo(0); assertThat(mOpContext.reason).isEqualTo(OperationReason.UNKNOWN); - assertThat(mOpContext.isAoD).isEqualTo(false); + assertThat(mOpContext.isAod).isEqualTo(false); assertThat(mOpContext.isCrypto).isEqualTo(false); for (int type : List.of(StatusBarManager.SESSION_BIOMETRIC_PROMPT, @@ -192,7 +192,7 @@ public class BiometricContextProviderTest { assertThat(context).isSameInstanceAs(mOpContext); assertThat(mOpContext.id).isEqualTo(id); assertThat(mOpContext.reason).isEqualTo(reason(type)); - assertThat(mOpContext.isAoD).isEqualTo(aod); + assertThat(mOpContext.isAod).isEqualTo(aod); assertThat(mOpContext.isCrypto).isEqualTo(false); mSessionListener.onSessionEnded(type, InstanceId.fakeInstanceId(id)); @@ -202,7 +202,7 @@ public class BiometricContextProviderTest { assertThat(context).isSameInstanceAs(mOpContext); assertThat(mOpContext.id).isEqualTo(0); assertThat(mOpContext.reason).isEqualTo(OperationReason.UNKNOWN); - assertThat(mOpContext.isAoD).isEqualTo(false); + assertThat(mOpContext.isAod).isEqualTo(false); assertThat(mOpContext.isCrypto).isEqualTo(false); }