Merge "Revert "[Autofill Framework] Add log on how many views are filte...""... (2fe8d19b) · Commits · e / os / android_frameworks_base

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -684,15 +684,6 @@ 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.
		@@ -789,7 +780,6 @@ public final class PresentationStatsEventLogger {
		+ " mAppPackageUid=" + mCallingAppUid
		+ " mIsCredentialRequest=" + event.mIsCredentialRequest
		+ " mWebviewRequestedCredential=" + event.mWebviewRequestedCredential
		+ " mFilteredFillabaleViewCount=" + event.mFilteredFillabaleViewCount
		+ " mViewFillableTotalCount=" + event.mViewFillableTotalCount
		+ " mViewFillFailureCount=" + event.mViewFillFailureCount
		+ " mFocusedId=" + event.mFocusedId
		@@ -846,7 +836,6 @@ public final class PresentationStatsEventLogger {
		mCallingAppUid,
		event.mIsCredentialRequest,
		event.mWebviewRequestedCredential,
		event.mFilteredFillabaleViewCount,
		event.mViewFillableTotalCount,
		event.mViewFillFailureCount,
		event.mFocusedId,
		@@ -895,7 +884,6 @@ 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

+0 −5

Original line number	Diff line number	Diff line
		@@ -6641,8 +6641,6 @@ 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;
		@@ -6655,7 +6653,6 @@ 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);
		@@ -6669,8 +6666,6 @@ 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);