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

Commit 73e99d20 authored by Haoran Zhang's avatar Haoran Zhang
Browse files

[Autofill Framework] Add log on how many views are filtered because they 

are not in current session

Bug: b/345570331
Test: atest CtsAutoFillServiceTestCases
Change-Id: I058e5e98fbd5df0ee753fe8f8ec39e3798b8092f
parent 43b19a4a

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

+12 −0
Original line number Diff line number Diff line
@@ -640,6 +640,15 @@ public final class PresentationStatsEventLogger { 
        });

    }



    /**

     * Set how many views are filtered from fill because they are not in current session

     */

    public void maybeSetFilteredFillableViewsCount(int filteredViewsCount) {

        mEventInternal.ifPresent(event -> {

            event.mFilteredFillabaleViewCount = filteredViewsCount;

        });

    }



    /**

     * Set views_filled_failure_count using failure count as long as mEventInternal

     * presents.
@@ -728,6 +737,7 @@ public final class PresentationStatsEventLogger { 
                    + " mAppPackageUid=" + mCallingAppUid

                    + " mIsCredentialRequest=" + event.mIsCredentialRequest

                    + " mWebviewRequestedCredential=" + event.mWebviewRequestedCredential

                    + " mFilteredFillabaleViewCount=" + event.mFilteredFillabaleViewCount

                    + " mViewFillableTotalCount=" + event.mViewFillableTotalCount

                    + " mViewFillFailureCount=" + event.mViewFillFailureCount

                    + " mFocusedId=" + event.mFocusedId
@@ -784,6 +794,7 @@ public final class PresentationStatsEventLogger { 
                mCallingAppUid,

                event.mIsCredentialRequest,

                event.mWebviewRequestedCredential,

                event.mFilteredFillabaleViewCount,

                event.mViewFillableTotalCount,

                event.mViewFillFailureCount,

                event.mFocusedId,
@@ -832,6 +843,7 @@ public final class PresentationStatsEventLogger { 
        int mFieldClassificationRequestId = DEFAULT_VALUE_INT;

        boolean mIsCredentialRequest = false;

        boolean mWebviewRequestedCredential = false;

        int mFilteredFillabaleViewCount = DEFAULT_VALUE_INT;

        int mViewFillableTotalCount = DEFAULT_VALUE_INT;

        int mViewFillFailureCount = DEFAULT_VALUE_INT;

        int mFocusedId = DEFAULT_VALUE_INT;

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

+5 −0
Original line number Diff line number Diff line
@@ -6603,6 +6603,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                boolean waitingDatasetAuth = false;

                boolean hideHighlight = (entryCount == 1

                        && dataset.getFieldIds().get(0).equals(mCurrentViewId));

                // Count how many views are filtered because they are not in current session

                int numOfViewsFiltered = 0;

                for (int i = 0; i < entryCount; i++) {

                    if (dataset.getFieldValues().get(i) == null) {

                        continue;
@@ -6615,6 +6617,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                            Slog.v(TAG, "Skipping filling view: " +

                                    viewId + " as it isn't part of the current session: " + id);

                        }

                        numOfViewsFiltered += 1;

                        continue;

                    }

                    ids.add(viewId);
@@ -6628,6 +6631,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                        viewState.resetState(ViewState.STATE_WAITING_DATASET_AUTH);

                    }

                }

                mPresentationStatsEventLogger.maybeSetFilteredFillableViewsCount(

                        numOfViewsFiltered);

                if (!ids.isEmpty()) {

                    if (waitingDatasetAuth) {

                        mUi.hideFillUi(this);