Additional logging for FieldClassification (999851ca) · Commits · e / os / android_frameworks_base

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

+79 −2

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,7 @@ public final class FieldClassificationEventLogger {
	}		}

	/**		/**
	* Set latency as long as mEventInternal presents.		* Set latency_millis as long as mEventInternal presents.
	*/		*/
	public void maybeSetLatencyMillis(long timestamp) {		public void maybeSetLatencyMillis(long timestamp) {
	mEventInternal.ifPresent(event -> {		mEventInternal.ifPresent(event -> {
	@@ -64,6 +64,69 @@ public final class FieldClassificationEventLogger {
	});		});
	}		}

			/**
			* Set count_classifications as long as mEventInternal presents.
			*/
			public void maybeSetCountClassifications(int countClassifications) {
			mEventInternal.ifPresent(event -> {
			event.mCountClassifications = countClassifications;
			});
			}

			/**
			* Set session_id as long as mEventInternal presents.
			*/
			public void maybeSetSessionId(int sessionId) {
			mEventInternal.ifPresent(event -> {
			event.mSessionId = sessionId;
			});
			}

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

			/**
			* Set next_fill_request_id as long as mEventInternal presents.
			*/
			public void maybeSetNextFillRequestId(int nextFillRequestId) {
			mEventInternal.ifPresent(event -> {
			event.mNextFillRequestId = nextFillRequestId;
			});
			}

			/**
			* Set app_package_uid as long as mEventInternal presents.
			*/
			public void maybeSetAppPackageUid(int uid) {
			mEventInternal.ifPresent(event -> {
			event.mAppPackageUid = uid;
			});
			}

			/**
			* Set status as long as mEventInternal presents.
			*/
			public void maybeSetRequestStatus(int status) {
			mEventInternal.ifPresent(event -> {
			event.mStatus = status;
			});
			}

			/**
			* Set is_session_gc as long as mEventInternal presents.
			*/
			public void maybeSetSessionGc(boolean isSessionGc) {
			mEventInternal.ifPresent(event -> {
			event.mIsSessionGc = isSessionGc;
			});
			}

	/**		/**
	* Log an AUTOFILL_FIELD_CLASSIFICATION_EVENT_REPORTED event.		* Log an AUTOFILL_FIELD_CLASSIFICATION_EVENT_REPORTED event.
	*/		*/
	@@ -81,12 +144,26 @@ public final class FieldClassificationEventLogger {
	}		}
	FrameworkStatsLog.write(		FrameworkStatsLog.write(
	AUTOFILL_FIELD_CLASSIFICATION_EVENT_REPORTED,		AUTOFILL_FIELD_CLASSIFICATION_EVENT_REPORTED,
	event.mLatencyClassificationRequestMillis);		event.mLatencyClassificationRequestMillis,
			event.mCountClassifications,
			event.mSessionId,
			event.mRequestId,
			event.mNextFillRequestId,
			event.mAppPackageUid,
			event.mStatus,
			event.mIsSessionGc);
	mEventInternal = Optional.empty();		mEventInternal = Optional.empty();
	}		}

	private static final class FieldClassificationEventInternal {		private static final class FieldClassificationEventInternal {
	long mLatencyClassificationRequestMillis = -1;		long mLatencyClassificationRequestMillis = -1;
			int mCountClassifications = -1;
			int mSessionId = -1;
			int mRequestId = -1;
			int mNextFillRequestId = -1;
			int mAppPackageUid = -1;
			int mStatus;
			boolean mIsSessionGc;

	FieldClassificationEventInternal() {		FieldClassificationEventInternal() {
	}		}

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

+22 −1

Original line number	Original line	Diff line number	Diff line
	@@ -508,6 +508,23 @@ public final class PresentationStatsEventLogger {
	return PICK_REASON_UNKNOWN;		return PICK_REASON_UNKNOWN;
	}		}

			/**
			* Set field_classification_request_id as long as mEventInternal presents.
			*/
			public void maybeSetFieldClassificationRequestId(int requestId) {
			mEventInternal.ifPresent(event -> {
			event.mFieldClassificationRequestId = requestId;
			});
			}

			/**
			* Set app_package_uid as long as mEventInternal presents.
			*/
			public void maybeSetAppPackageUid(int uid) {
			mEventInternal.ifPresent(event -> {
			event.mAppPackageUid = uid;
			});
			}

	public void logAndEndEvent() {		public void logAndEndEvent() {
	if (!mEventInternal.isPresent()) {		if (!mEventInternal.isPresent()) {
	@@ -584,7 +601,9 @@ public final class PresentationStatsEventLogger {
	event.mAvailablePccCount,		event.mAvailablePccCount,
	event.mAvailablePccOnlyCount,		event.mAvailablePccOnlyCount,
	event.mSelectedDatasetPickedReason,		event.mSelectedDatasetPickedReason,
	event.mDetectionPreference);		event.mDetectionPreference,
			event.mFieldClassificationRequestId,
			event.mAppPackageUid);
	mEventInternal = Optional.empty();		mEventInternal = Optional.empty();
	}		}

	@@ -617,6 +636,8 @@ public final class PresentationStatsEventLogger {
	int mAvailablePccOnlyCount = -1;		int mAvailablePccOnlyCount = -1;
	@DatasetPickedReason int mSelectedDatasetPickedReason = PICK_REASON_UNKNOWN;		@DatasetPickedReason int mSelectedDatasetPickedReason = PICK_REASON_UNKNOWN;
	@DetectionPreference int mDetectionPreference = DETECTION_PREFER_UNKNOWN;		@DetectionPreference int mDetectionPreference = DETECTION_PREFER_UNKNOWN;
			int mFieldClassificationRequestId = -1;
			int mAppPackageUid = -1;

	PresentationStatsEventInternal() {}		PresentationStatsEventInternal() {}
	}		}