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

Commit 7dc217b2 authored by Daniel Kim's avatar Daniel Kim Committed by Android (Google) Code Review
Browse files

Merge changes from topic "is_credential_request" into main

* changes:
  impl of is_credential_request
  is_credential_request field for presentation metric
parents 8beecc5a 681244b5
Loading
Loading
Loading
Loading
+15 −2
Original line number Diff line number Diff line
@@ -240,10 +240,20 @@ public final class PresentationStatsEventLogger {
        mEventInternal = Optional.of(new PresentationStatsEventInternal());
    }

    /**
     * Set request_id
     */
    public void maybeSetRequestId(int requestId) {
        mEventInternal.ifPresent(event -> event.mRequestId = requestId);
    }

    /**
     * Set is_credential_request
     */
    public void maybeSetIsCredentialRequest(boolean isCredentialRequest) {
        mEventInternal.ifPresent(event -> event.mIsCredentialRequest = isCredentialRequest);
    }

    public void maybeSetNoPresentationEventReason(@NotShownReason int reason) {
        mEventInternal.ifPresent(event -> {
            if (event.mCountShown == 0) {
@@ -567,7 +577,8 @@ public final class PresentationStatsEventLogger {
                    + " mSelectedDatasetPickedReason=" + event.mSelectedDatasetPickedReason
                    + " mDetectionPreference=" + event.mDetectionPreference
                    + " mFieldClassificationRequestId=" + event.mFieldClassificationRequestId
                    + " mAppPackageUid=" + mCallingAppUid);
                    + " mAppPackageUid=" + mCallingAppUid
                    + " mIsCredentialRequest=" + event.mIsCredentialRequest);
        }

        // TODO(b/234185326): Distinguish empty responses from other no presentation reasons.
@@ -606,7 +617,8 @@ public final class PresentationStatsEventLogger {
                event.mSelectedDatasetPickedReason,
                event.mDetectionPreference,
                event.mFieldClassificationRequestId,
                mCallingAppUid);
                mCallingAppUid,
                event.mIsCredentialRequest);
        mEventInternal = Optional.empty();
    }

@@ -640,6 +652,7 @@ public final class PresentationStatsEventLogger {
        @DatasetPickedReason int mSelectedDatasetPickedReason = PICK_REASON_UNKNOWN;
        @DetectionPreference int mDetectionPreference = DETECTION_PREFER_UNKNOWN;
        int mFieldClassificationRequestId = -1;
        boolean mIsCredentialRequest = false;

        PresentationStatsEventInternal() {}
    }
+4 −0
Original line number Diff line number Diff line
@@ -1290,7 +1290,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
            Slog.v(TAG, "Requesting structure for request #" + ordinal + " ,requestId=" + requestId
                    + ", flags=" + flags);
        }
        boolean isCredmanRequested = (flags & FLAG_VIEW_REQUESTS_CREDMAN_SERVICE) != 0;
        mPresentationStatsEventLogger.maybeSetRequestId(requestId);
        mPresentationStatsEventLogger.maybeSetIsCredentialRequest(isCredmanRequested);
        mPresentationStatsEventLogger.maybeSetFieldClassificationRequestId(
                mFieldClassificationIdSnapshot);
        mFillRequestEventLogger.maybeSetRequestId(requestId);
@@ -4360,8 +4362,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
                }

                if (viewState.getResponse() != null) {
                    boolean isCredmanRequested = (flags & FLAG_VIEW_REQUESTS_CREDMAN_SERVICE) != 0;
                    FillResponse response = viewState.getResponse();
                    mPresentationStatsEventLogger.maybeSetRequestId(response.getRequestId());
                    mPresentationStatsEventLogger.maybeSetIsCredentialRequest(isCredmanRequested);
                    mPresentationStatsEventLogger.maybeSetFieldClassificationRequestId(
                            mFieldClassificationIdSnapshot);
                    mPresentationStatsEventLogger.maybeSetAvailableCount(