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

Commit 7595345c authored by Tim Yu's avatar Tim Yu
Browse files

Autofill Presentation Logs 

Add Focused AutofillId to Presentation Logs

Fixes: 337078753
Test: n/a, logging only change
Change-Id: I18c80adc4b64ddab7f7a5c48b1ca0f1dab8a2c76
parent d308133c

services/autofill/java/com/android/server/autofill/PresentationStatsEventLogger.java

+17 −2
Original line number Diff line number Diff line
@@ -564,6 +564,18 @@ public final class PresentationStatsEventLogger { 
        });

    }



    /** Sets focused_autofill_id using view id */

    public void maybeSetFocusedId(AutofillId id) {

        maybeSetFocusedId(id.getViewId());

    }



    /** Sets focused_autofill_id as long as mEventInternal is present */

    public void maybeSetFocusedId(int id) {

        mEventInternal.ifPresent(event -> {

            event.mFocusedId = id;

        });

    }



    public void logAndEndEvent() {

        if (!mEventInternal.isPresent()) {

            Slog.w(TAG, "Shouldn't be logging AutofillPresentationEventReported again for same "
@@ -608,7 +620,8 @@ public final class PresentationStatsEventLogger { 
                    + " mIsCredentialRequest=" + event.mIsCredentialRequest

                    + " mWebviewRequestedCredential=" + event.mWebviewRequestedCredential

                    + " mViewFillableTotalCount=" + event.mViewFillableTotalCount

                    + " mViewFillFailureCount=" + event.mViewFillFailureCount);

                    + " mViewFillFailureCount=" + event.mViewFillFailureCount

                    + " mFocusedId=" + event.mFocusedId);

        }



        // TODO(b/234185326): Distinguish empty responses from other no presentation reasons.
@@ -651,7 +664,8 @@ public final class PresentationStatsEventLogger { 
                event.mIsCredentialRequest,

                event.mWebviewRequestedCredential,

                event.mViewFillableTotalCount,

                event.mViewFillFailureCount);

                event.mViewFillFailureCount,

                event.mFocusedId);

        mEventInternal = Optional.empty();

    }
@@ -689,6 +703,7 @@ public final class PresentationStatsEventLogger { 
        boolean mWebviewRequestedCredential = false;

        int mViewFillableTotalCount = -1;

        int mViewFillFailureCount = -1;

        int mFocusedId = -1;



        PresentationStatsEventInternal() {}

    }

services/autofill/java/com/android/server/autofill/Session.java

+1 −0
Original line number Diff line number Diff line
@@ -4669,6 +4669,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                mFieldClassificationIdSnapshot);

        mPresentationStatsEventLogger.maybeSetAvailableCount(

                response.getDatasets(), mCurrentViewId);

        mPresentationStatsEventLogger.maybeSetFocusedId(mCurrentViewId);

    }



    @GuardedBy("mLock")