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

Commit 3ae16c77 authored by Arpan Kaphle's avatar Arpan Kaphle Committed by Automerger Merge Worker
Browse files

Merge "Collecting query framework exception and origin" into udc-dev am: 90d2c471 

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



Change-Id: Ice7d502e44a78df5e19b691212dc34a70bd932c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50fcd0cc 90d2c471

services/credentials/java/com/android/server/credentials/MetricUtilities.java

+15 −7
Original line number Diff line number Diff line
@@ -178,9 +178,11 @@ public class MetricUtilities { 
     *

     * @param providers      a map with known providers and their held metric objects

     * @param emitSequenceId an emitted sequence id for the current session

     * @param initialPhaseMetric contains initial phase data to avoid repetition for candidate

     *                           phase, track 2, logging

     */

    public static void logApiCalledCandidatePhase(Map<String, ProviderSession> providers,

            int emitSequenceId) {

            int emitSequenceId, InitialPhaseMetric initialPhaseMetric) {

        try {

            if (!LOG_FLAG) {

                return;
@@ -200,6 +202,7 @@ public class MetricUtilities { 
            int[] candidateActionEntryCountList = new int[providerSize];

            int[] candidateAuthEntryCountList = new int[providerSize];

            int[] candidateRemoteEntryCountList = new int[providerSize];

            String[] frameworkExceptionList = new String[providerSize];

            int index = 0;

            for (var session : providerSessions) {

                CandidatePhaseMetric metric = session.mProviderSessionMetric
@@ -225,7 +228,7 @@ public class MetricUtilities { 
                candidateActionEntryCountList[index] = metric.getActionEntryCount();

                candidateAuthEntryCountList[index] = metric.getAuthenticationEntryCount();

                candidateRemoteEntryCountList[index] = metric.getRemoteEntryCount();

                // frameworkExceptionList[index] = metric.getFrameworkException();

                frameworkExceptionList[index] = metric.getFrameworkException();

                index++;

            }

            FrameworkStatsLog.write(FrameworkStatsLog.CREDENTIAL_MANAGER_CANDIDATE_PHASE_REPORTED,
@@ -246,11 +249,16 @@ public class MetricUtilities { 
                    /* candidate_provider_credential_entry_type_count */

                    candidateCredentialTypeCountList,

                    /* candidate_provider_remote_entry_count */ candidateRemoteEntryCountList,

                    /* candidate_provider_authentication_entry_count */ candidateAuthEntryCountList,

                    DEFAULT_REPEATED_STR,

                    false,

                    DEFAULT_REPEATED_STR,

                    DEFAULT_REPEATED_INT_32

                    /* candidate_provider_authentication_entry_count */

                    candidateAuthEntryCountList,

                    /* framework_exception_per_provider */

                    frameworkExceptionList,

                    /* origin_specified originSpecified */

                    initialPhaseMetric.isOriginSpecified(),

                    /* request_unique_classtypes */

                    initialPhaseMetric.getUniqueRequestStrings(),

                    /* per_classtype_counts */

                    initialPhaseMetric.getUniqueRequestCounts()

            );

        } catch (Exception e) {

            Log.w(TAG, "Unexpected error during metric logging: " + e);

services/credentials/java/com/android/server/credentials/ProviderClearSession.java

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ public final class ProviderClearSession extends ProviderSession<ClearCredentialS 
    public void onProviderResponseFailure(int errorCode, Exception exception) {

        if (exception instanceof ClearCredentialStateException) {

            mProviderException = (ClearCredentialStateException) exception;

            // TODO(b/271135048) : Decide on exception type length

            mProviderSessionMetric.collectCandidateFrameworkException(mProviderException.getType());

        }

        mProviderSessionMetric.collectCandidateExceptionStatus(/*hasException=*/true);

        updateStatusAndInvokeCallback(toStatus(errorCode),

services/credentials/java/com/android/server/credentials/ProviderCreateSession.java

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ public final class ProviderCreateSession extends ProviderSession< 
        if (exception instanceof CreateCredentialException) {

            // Store query phase exception for aggregation with final response

            mProviderException = (CreateCredentialException) exception;

            // TODO(b/271135048) : Decide on exception type length

            mProviderSessionMetric.collectCandidateFrameworkException(mProviderException.getType());

        }

        mProviderSessionMetric.collectCandidateExceptionStatus(/*hasException=*/true);

        updateStatusAndInvokeCallback(toStatus(errorCode),

services/credentials/java/com/android/server/credentials/ProviderGetSession.java

+2 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential 
    public void onProviderResponseFailure(int errorCode, Exception exception) {

        if (exception instanceof GetCredentialException) {

            mProviderException = (GetCredentialException) exception;

            // TODO(b/271135048) : Decide on exception type length

            mProviderSessionMetric.collectCandidateFrameworkException(mProviderException.getType());

        }

        mProviderSessionMetric.collectCandidateExceptionStatus(/*hasException=*/true);

        updateStatusAndInvokeCallback(toStatus(errorCode),

services/credentials/java/com/android/server/credentials/metrics/ApiName.java

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_IS_ENABLED_CREDENT 
    );



    ApiName(int innerMetricCode) {

        this.mInnerMetricCode = innerMetricCode;

        mInnerMetricCode = innerMetricCode;

    }



    /**
@@ -66,7 +66,7 @@ CREDENTIAL_MANAGER_INITIAL_PHASE_REPORTED__API_NAME__API_NAME_IS_ENABLED_CREDENT 
     * @return a code corresponding to the west world metric name

     */

    public int getMetricCode() {

        return this.mInnerMetricCode;

        return mInnerMetricCode;

    }



    /**