Added moar augmented-autofill metrics:

- AUTOFILL_AUGMENTED_WHITELIST_REQUEST
- AUTOFILL_AUGMENTED_RESPONSE
- FIELD_AUTOFILL_AUGMENTED_ONLY on AUTOFILL_SESSION_FINISHED

Test: adb shell logcat -b events | grep sysui
Test: atest CtsContentCaptureServiceTestCases # sanity check

Bug: 112192360
Fixes: 122858578

Merged-In: Ia6bfced9396dd9e3f8ef2a6c45415dc22f4327c9
Change-Id: Ia6bfced9396dd9e3f8ef2a6c45415dc22f4327c9

1 files changed, 41 insertions, 1 deletions

diff --git a/proto/src/metrics_constants/metrics_constants.proto b/proto/src/metrics_constants/metrics_constants.proto
index fa62f64d59ca..e30e166a46b5 100644
--- a/proto/src/metrics_constants/metrics_constants.proto
+++ b/proto/src/metrics_constants/metrics_constants.proto
@@ -4191,6 +4191,8 @@ message MetricsEvent {
     // Tag FIELD_AUTOFILL_COMPAT_MODE: package is being autofilled on compatibility mode.
     // Tag FIELD_AUTOFILL_NUMBER_REQUESTS: number of requests made to the service (each request
     //     is logged by a separate AUTOFILL_REQUEST metric)
+    // NOTE: starting on OS Q, it also added the following fields:
+    // TAg FIELD_AUTOFILL_AUGMENTED_ONLY: if the session was used just for augmented autofill
     AUTOFILL_SESSION_FINISHED = 919;
 
     // meta-event: a reader has checkpointed the log here.
@@ -7243,8 +7245,46 @@ message MetricsEvent {
     // OS: Q
     ACTION_DIRECT_SHARE_TARGETS_LOADED_CHOOSER_SERVICE = 1719;
 
-    // ---- Skipping ahead to avoid conflicts between master and release branches.
+    // Field indicating that an autofill session was created just for augmented autofill purposes.
+    // OS: Q
+    // Value: 1 for true, absent when false
+    FIELD_AUTOFILL_AUGMENTED_ONLY = 1720;
+
+    // The augmented autofill service set its whitelisted packages and activities.
+    // OS: Q
+    // Tag FIELD_AUTOFILL_SERVICE: Package of the augmented autofill service that processed the
+    // request
+    // Tag FIELD_AUTOFILL_NUMBER_PACKAGES: Number of whitelisted packages.
+    // Tag FIELD_AUTOFILL_NUMBER_ACTIVITIES: Number of whitelisted activities.
+    AUTOFILL_AUGMENTED_WHITELIST_REQUEST = 1721;
+
+    // Generic field used to indicate the number of packages in an Autofill metric (typically a
+    // whitelist request).
+    // OS: Q
+    FIELD_AUTOFILL_NUMBER_PACKAGES = 1722;
 
+    // Generic field used to indicate the number of activities in an Autofill metric (typically a
+    // whitelist request).
+    // OS: Q
+    FIELD_AUTOFILL_NUMBER_ACTIVITIES = 1723;
+
+    // Reports the result of a request made to the augmented autofill service
+    // OS: Q
+    // Type TYPE_UNKNOWN: if the type of response could not be determined
+    // Type TYPE_SUCCESS: service called onSucess() passing null
+    // Type TYPE_OPEN: service shown the UI
+    // Type TYPE_CLOSE: service hid the UI
+    // Type TYPE_ERROR: service timed out responding
+
+    // Tag FIELD_CLASS_NAME: Class name of the activity that is autofilled.
+    // Tag FIELD_AUTOFILL_SERVICE: Package of the augmented autofill service that processed the
+    // request
+    // Tag FIELD_AUTOFILL_SESSION_ID: id of the autofill session associated with this metric
+    // Tag FIELD_AUTOFILL_DURATION: how long it took (in ms) to the service to respond, or -1 if the
+    // type of response could not be determined
+    AUTOFILL_AUGMENTED_RESPONSE = 1724;
+
+    // ---- Skipping ahead to avoid conflicts between master and release branches.
     // OPEN: Settings > System > Gestures > Global Actions Panel
     // CATEGORY: SETTINGS
     // OS: Q