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

Commit 5eac280d authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Id2602174e5c8edce2fe8d1b4a41b2d47631cd205
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da7f9042 56443582

services/core/java/com/android/server/biometrics/log/BiometricContextProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public final class BiometricContextProvider implements BiometricContext { 
    @Override

    public OperationContextExt updateContext(@NonNull OperationContextExt operationContext,

            boolean isCryptoOperation) {

        return operationContext.update(this);

        return operationContext.update(this, isCryptoOperation);

    }



    @Nullable
@@ -238,7 +238,7 @@ public final class BiometricContextProvider implements BiometricContext { 


    private void notifySubscribers() {

        mSubscribers.forEach((context, consumer) -> {

            consumer.accept(context.update(this).toAidlContext());

            consumer.accept(context.update(this, context.isCrypto()).toAidlContext());

        });

    }

services/core/java/com/android/server/biometrics/log/OperationContextExt.java

+2 −1
Original line number Diff line number Diff line
@@ -241,9 +241,10 @@ public class OperationContextExt { 
    }



    /** 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.displayState = toAidlDisplayState(biometricContext.getDisplayState());

        mAidlContext.isCrypto = isCrypto;

        setFirstSessionId(biometricContext);



        mIsDisplayOn = biometricContext.isDisplayOn();

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

+2 −2
Original line number Diff line number Diff line
@@ -316,13 +316,13 @@ public class BiometricContextProviderTest { 
        assertThat(aidlContext.isAod).isEqualTo(false);

        assertThat(aidlContext.isCrypto).isEqualTo(false);



        context = mProvider.updateContext(mOpContext, false /* crypto */);

        context = mProvider.updateContext(mOpContext, true /* crypto */);

        aidlContext = context.toAidlContext();

        assertThat(context).isSameInstanceAs(mOpContext);

        assertThat(aidlContext.id).isEqualTo(0);

        assertThat(aidlContext.reason).isEqualTo(OperationReason.UNKNOWN);

        assertThat(aidlContext.isAod).isEqualTo(false);

        assertThat(aidlContext.isCrypto).isEqualTo(false);

        assertThat(aidlContext.isCrypto).isEqualTo(true);

    }



    @Test

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

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class OperationContextExtTest { 
        for (Map.Entry<Integer, Integer> entry : map.entrySet()) {

            final OperationContextExt context = new OperationContextExt(newAidlContext(), true);

            when(mBiometricContext.getDisplayState()).thenReturn(entry.getKey());

            assertThat(context.update(mBiometricContext).getDisplayState())

            assertThat(context.update(mBiometricContext, context.isCrypto()).getDisplayState())

                    .isEqualTo(entry.getValue());

        }

    }
@@ -139,7 +139,7 @@ public class OperationContextExtTest { 
        final OperationContextExt context = new OperationContextExt(newAidlContext(),

                sessionType == OperationReason.BIOMETRIC_PROMPT);



        assertThat(context.update(mBiometricContext)).isSameInstanceAs(context);

        assertThat(context.update(mBiometricContext, context.isCrypto())).isSameInstanceAs(context);



        if (sessionInfo != null) {

            assertThat(context.getId()).isEqualTo(sessionInfo.getId());