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

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

Merge "Collecting origin in logging system" into udc-dev am: b88aaa33 

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



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

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,8 @@ public final class CreateRequestSession extends RequestSession<CreateCredentialR 
        super(context, sessionCallback, lock, userId, callingUid, request, callback,

        super(context, sessionCallback, lock, userId, callingUid, request, callback,

                RequestInfo.TYPE_CREATE,

                RequestInfo.TYPE_CREATE,

                callingAppInfo, enabledProviders, cancellationSignal, startedTimestamp);

                callingAppInfo, enabledProviders, cancellationSignal, startedTimestamp);

        mRequestSessionMetric.collectCreateFlowInitialMetricInfo(

                /*origin=*/request.getOrigin() != null);

    }

    }





    /**

    /**

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,8 @@ public class GetRequestSession extends RequestSession<GetCredentialRequest, 
        int numTypes = (request.getCredentialOptions().stream()

        int numTypes = (request.getCredentialOptions().stream()

                .map(CredentialOption::getType).collect(

                .map(CredentialOption::getType).collect(

                        Collectors.toSet())).size(); // Dedupe type strings

                        Collectors.toSet())).size(); // Dedupe type strings

        mRequestSessionMetric.collectGetFlowInitialMetricInfo(numTypes);

        mRequestSessionMetric.collectGetFlowInitialMetricInfo(numTypes,

                /*origin=*/request.getOrigin() != null);

    }

    }





    /**

    /**

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -287,6 +287,8 @@ public class MetricUtilities { 
                    /* count_credential_request_classtypes */

                    /* count_credential_request_classtypes */

                    initialPhaseMetric.getCountRequestClassType()

                    initialPhaseMetric.getCountRequestClassType()

                    // TODO(b/271135048) - add total count of request options

                    // TODO(b/271135048) - add total count of request options

                    // TODO(b/271135048) - Uncomment once built past PWG review -

                    // initialPhaseMetric.isOriginSpecified()

            );

            );

        } catch (Exception e) {

        } catch (Exception e) {

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

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

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,8 @@ public class PrepareGetRequestSession extends GetRequestSession { 
        int numTypes = (request.getCredentialOptions().stream()

        int numTypes = (request.getCredentialOptions().stream()

                .map(CredentialOption::getType).collect(

                .map(CredentialOption::getType).collect(

                        Collectors.toSet())).size(); // Dedupe type strings

                        Collectors.toSet())).size(); // Dedupe type strings

        mRequestSessionMetric.collectGetFlowInitialMetricInfo(numTypes);

        mRequestSessionMetric.collectGetFlowInitialMetricInfo(numTypes,

                /*origin=*/request.getOrigin() != null);

        mPrepareGetCredentialCallback = prepareGetCredentialCallback;

        mPrepareGetCredentialCallback = prepareGetCredentialCallback;

    }

    }

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,10 @@ public class InitialPhaseMetric { 
    // over to the next latency object.

    // over to the next latency object.

    private long mCredentialServiceBeginQueryTimeNanoseconds = -1;

    private long mCredentialServiceBeginQueryTimeNanoseconds = -1;





    // Indicates if the origin was specified when making this API request

    // TODO(b/271135048) - Emit once metrics approved

    private boolean mOriginSpecified = false;







    public InitialPhaseMetric() {

    public InitialPhaseMetric() {

    }

    }
@@ -115,4 +119,12 @@ public class InitialPhaseMetric { 
    public int getCountRequestClassType() {

    public int getCountRequestClassType() {

        return mCountRequestClassType;

        return mCountRequestClassType;

    }

    }



    public void setOriginSpecified(boolean originSpecified) {

        mOriginSpecified = originSpecified;

    }



    public boolean isOriginSpecified() {

        return mOriginSpecified;

    }

}
 
}