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

Commit 32251e10 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update operationContext with sessionInfo for Atom logs" into udc-d1-dev am: bf9f55f0 

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



Change-Id: I952e43746f5da1c6752408a1edd0011160da6a54
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68adfb47 bf9f55f0

services/core/java/com/android/server/biometrics/AuthSession.java

+13 −6
Original line number Diff line number Diff line
@@ -150,6 +150,10 @@ public final class AuthSession implements IBinder.DeathRecipient { 
    // Timestamp when hardware authentication occurred

    private long mAuthenticatedTimeMs;



    @NonNull

    private final OperationContextExt mOperationContext;





    AuthSession(@NonNull Context context,

            @NonNull BiometricContext biometricContext,

            @NonNull IStatusBarService statusBarService,
@@ -215,6 +219,7 @@ public final class AuthSession implements IBinder.DeathRecipient { 
        mFingerprintSensorProperties = fingerprintSensorProperties;

        mCancelled = false;

        mBiometricFrameworkStatsLogger = logger;

        mOperationContext = new OperationContextExt(true /* isBP */);



        try {

            mClientReceiver.asBinder().linkToDeath(this, 0 /* flags */);
@@ -581,6 +586,8 @@ public final class AuthSession implements IBinder.DeathRecipient { 
        } else {

            Slog.d(TAG, "delaying fingerprint sensor start");

        }



        mBiometricContext.updateContext(mOperationContext, isCrypto());

    }



    // call once anytime after onDialogAnimatedIn() to indicate it's appropriate to start the
@@ -743,12 +750,12 @@ public final class AuthSession implements IBinder.DeathRecipient { 
                        + ", Client: " + BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT

                        + ", RequireConfirmation: " + mPreAuthInfo.confirmationRequested

                        + ", State: " + FrameworkStatsLog.BIOMETRIC_AUTHENTICATED__STATE__CONFIRMED

                        + ", Latency: " + latency);

                        + ", Latency: " + latency

                        + ", SessionId: " + mOperationContext.getId());

            }



            mBiometricFrameworkStatsLogger.authenticate(

                    mBiometricContext.updateContext(new OperationContextExt(true /* isBP */),

                            isCrypto()),

                    mOperationContext,

                    statsModality(),

                    BiometricsProtoEnums.ACTION_UNKNOWN,

                    BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT,
@@ -780,13 +787,13 @@ public final class AuthSession implements IBinder.DeathRecipient { 
                        + ", Client: " + BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT

                        + ", Reason: " + reason

                        + ", Error: " + error

                        + ", Latency: " + latency);

                        + ", Latency: " + latency

                        + ", SessionId: " + mOperationContext.getId());

            }

            // Auth canceled

            if (error != 0) {

                mBiometricFrameworkStatsLogger.error(

                        mBiometricContext.updateContext(new OperationContextExt(true /* isBP */),

                                isCrypto()),

                        mOperationContext,

                        statsModality(),

                        BiometricsProtoEnums.ACTION_AUTHENTICATE,

                        BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT,

services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java

+2 −0
Original line number Diff line number Diff line
@@ -351,6 +351,8 @@ public class AuthSessionTest { 
        assertEquals(startFingerprintNow ? BiometricSensor.STATE_AUTHENTICATING

                        : BiometricSensor.STATE_COOKIE_RETURNED,

                session.mPreAuthInfo.eligibleSensors.get(fingerprintSensorId).getSensorState());

        verify(mBiometricContext).updateContext((OperationContextExt) anyObject(),

                eq(session.isCrypto()));



        // start fingerprint sensor if it was delayed

        if (!startFingerprintNow) {