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

Merge "Update crypto value for logging" into udc-dev am: a3373234c5

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

Change-Id: I78892e27c7257a31ad1a99ec114ee71487b7bf6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2023-05-26 16:35:02 +00:00
committed by Automerger Merge Worker
parent 71c937eccf a3373234c5
commit a24e994d43
4 changed files with 8 additions and 7 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

@@ -156,7 +156,7 @@ public final class BiometricContextProvider implements BiometricContext {
@Override @Override
public OperationContextExt updateContext(@NonNull OperationContextExt operationContext, public OperationContextExt updateContext(@NonNull OperationContextExt operationContext,
boolean isCryptoOperation) { boolean isCryptoOperation) {
return operationContext.update(this); return operationContext.update(this, isCryptoOperation);
} }
@Nullable @Nullable
@@ -238,7 +238,7 @@ public final class BiometricContextProvider implements BiometricContext {
private void notifySubscribers() { private void notifySubscribers() {
mSubscribers.forEach((context, consumer) -> { mSubscribers.forEach((context, consumer) -> {
consumer.accept(context.update(this).toAidlContext()); consumer.accept(context.update(this, context.isCrypto()).toAidlContext());
}); });
} }

3
services/core/java/com/android/server/biometrics/log/OperationContextExt.java
View File

@@ -241,9 +241,10 @@ public class OperationContextExt {
} }
/** Update this object with the latest values from the given context. */ /** Update this object with the latest values from the given context. */
OperationContextExt update(@NonNull BiometricContext biometricContext) { OperationContextExt update(@NonNull BiometricContext biometricContext, boolean isCrypto) {
mAidlContext.isAod = biometricContext.isAod(); mAidlContext.isAod = biometricContext.isAod();
mAidlContext.displayState = toAidlDisplayState(biometricContext.getDisplayState()); mAidlContext.displayState = toAidlDisplayState(biometricContext.getDisplayState());
mAidlContext.isCrypto = isCrypto;
setFirstSessionId(biometricContext); setFirstSessionId(biometricContext);
mIsDisplayOn = biometricContext.isDisplayOn(); mIsDisplayOn = biometricContext.isDisplayOn();

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

@@ -316,13 +316,13 @@ public class BiometricContextProviderTest {
assertThat(aidlContext.isAod).isEqualTo(false); assertThat(aidlContext.isAod).isEqualTo(false);
assertThat(aidlContext.isCrypto).isEqualTo(false); assertThat(aidlContext.isCrypto).isEqualTo(false);
context = mProvider.updateContext(mOpContext, false /* crypto */); context = mProvider.updateContext(mOpContext, true /* crypto */);
aidlContext = context.toAidlContext(); aidlContext = context.toAidlContext();
assertThat(context).isSameInstanceAs(mOpContext); assertThat(context).isSameInstanceAs(mOpContext);
assertThat(aidlContext.id).isEqualTo(0); assertThat(aidlContext.id).isEqualTo(0);
assertThat(aidlContext.reason).isEqualTo(OperationReason.UNKNOWN); assertThat(aidlContext.reason).isEqualTo(OperationReason.UNKNOWN);
assertThat(aidlContext.isAod).isEqualTo(false); assertThat(aidlContext.isAod).isEqualTo(false);
assertThat(aidlContext.isCrypto).isEqualTo(false); assertThat(aidlContext.isCrypto).isEqualTo(true);
} }
@Test @Test

4
services/tests/servicestests/src/com/android/server/biometrics/log/OperationContextExtTest.java
View File

@@ -98,7 +98,7 @@ public class OperationContextExtTest {
for (Map.Entry<Integer, Integer> entry : map.entrySet()) { for (Map.Entry<Integer, Integer> entry : map.entrySet()) {
final OperationContextExt context = new OperationContextExt(newAidlContext(), true); final OperationContextExt context = new OperationContextExt(newAidlContext(), true);
when(mBiometricContext.getDisplayState()).thenReturn(entry.getKey()); when(mBiometricContext.getDisplayState()).thenReturn(entry.getKey());
assertThat(context.update(mBiometricContext).getDisplayState()) assertThat(context.update(mBiometricContext, context.isCrypto()).getDisplayState())
.isEqualTo(entry.getValue()); .isEqualTo(entry.getValue());
} }
} }
@@ -139,7 +139,7 @@ public class OperationContextExtTest {
final OperationContextExt context = new OperationContextExt(newAidlContext(), final OperationContextExt context = new OperationContextExt(newAidlContext(),
sessionType == OperationReason.BIOMETRIC_PROMPT); sessionType == OperationReason.BIOMETRIC_PROMPT);
assertThat(context.update(mBiometricContext)).isSameInstanceAs(context); assertThat(context.update(mBiometricContext, context.isCrypto())).isSameInstanceAs(context);
if (sessionInfo != null) { if (sessionInfo != null) {
assertThat(context.getId()).isEqualTo(sessionInfo.getId()); assertThat(context.getId()).isEqualTo(sessionInfo.getId());