Revert "Add Autofill framework logging atom as defined in go/aut..."
Revert submission 21112752-add-new-atuofill-framework-logging
Reason for revert: Cause Build Breakage
Reverted changes: /q/submissionid:21112752-add-new-atuofill-framework-logging
Change-Id: I916cd4a3e5e41fa30f63156a59269319eab86a79
diff --git a/stats/Android.bp b/stats/Android.bp
index f8dbb4a..b0b8da4 100644
--- a/stats/Android.bp
+++ b/stats/Android.bp
@@ -25,7 +25,6 @@
"enums/adservices/fledge/*.proto",
"enums/anr/*.proto",
"enums/app/**/*.proto",
- "enums/autofill/**/*.proto",
"enums/contexthub/*.proto",
"enums/debug/*.proto",
"enums/display/*.proto",
@@ -86,7 +85,6 @@
"atoms/adpf/*.proto",
"atoms/agif/*.proto",
"atoms/art/*.proto",
- "atoms/autofill/*.proto",
"atoms/credentials/*.proto",
"atoms/display/*.proto",
"atoms/expresslog/*.proto",
diff --git a/stats/atoms.proto b/stats/atoms.proto
index 9110604..f917b47 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -28,7 +28,6 @@
import "frameworks/proto_logging/stats/atoms/art/art_atoms.proto";
import "frameworks/proto_logging/stats/atoms/art/background_dexopt_atoms.proto";
import "frameworks/proto_logging/stats/atoms/art/odrefresh_atoms.proto";
-import "frameworks/proto_logging/stats/atoms/autofill/autofill_atoms.proto";
import "frameworks/proto_logging/stats/atoms/credentials/credentials_atoms.proto";
import "frameworks/proto_logging/stats/atoms/display/display_atoms.proto";
import "frameworks/proto_logging/stats/atoms/expresslog/expresslog_atoms.proto";
@@ -939,11 +938,6 @@
wearservices.WsNotificationUpdated ws_notification_updated = 596
[(module) = "wearservices"];
display.ScreenBrightnessChangedV2 screen_brightness_changes_v2 = 597 [(module) = "framework"];
- autofill.AutofillUiEventReported autofill_ui_event_reported = 600 [(module) = "framework"];
- autofill.AutofillFillRequestReported autofill_fill_request_reported = 601 [(module) = "framework"];
- autofill.AutofillFillResponseReported autofill_fill_response_reported = 602 [(module) = "framework"];
- autofill.AutofillSaveEventReported autofill_save_event_reported = 603 [(module) = "framework"];
- autofill.AutofillSessionCommitted autofill_session_committed = 604 [(module) = "framework"];
// StatsdStats tracks platform atoms with ids up to 750.
// Update StatsdStats::kMaxPushedAtomId when atom ids here approach that value.
}
@@ -21881,8 +21875,7 @@
8; // Autofill provider request was triggered pre-focus. User never
// focussed on autofillable fields. This can happen for FillDialog
// where we trigger fill request at layout time.
- NONE_SHOWN_VIEW_FOCUSED_BEFORE_FILL_DIALOG_RESPONSE =
- 9; // Users focus a field before the fill dialogs response is returned.
+
}
// Id number which increases for each subsequent request.
@@ -21958,18 +21951,6 @@
// The latency of showing suggestions can be calculated by
// suggestionPresentedTimestampMs - suggestionSentTimestampMs
optional int32 suggestion_presented_timestamp_ms = 16;
-
- // The index of the dataset that a user selected. -1 if not selected.
- optional int32 selected_dataset_id = 17;
-
- // True if the user dismissed the fill UI.
- optional bool dialog_dismissed = 18;
-
- // True if the user clicked the negative CTA button.
- optional bool negative_cta_button_clicked = 19;
-
- // True if the user clicked the positive CTA button.
- optional bool positive_cta_button_clicked = 20;
}
// Tells how Autofill dataset was/will-be displayed.
diff --git a/stats/atoms/autofill/autofill_atoms.proto b/stats/atoms/autofill/autofill_atoms.proto
deleted file mode 100644
index e204630..0000000
--- a/stats/atoms/autofill/autofill_atoms.proto
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-syntax = "proto2";
-
-package android.os.statsd.autofill;
-
-import "frameworks/proto_logging/stats/atom_field_options.proto";
-import "frameworks/proto_logging/stats/enums/autofill/enums.proto";
-
-option java_package = "com.android.os.autofill";
-option java_multiple_files = true;
-
-/**
- * Log Autofill related system UI events.
- *
- * Logged from:
- * packages/apps/Settings/src/com/android/settings/
- */
-message AutofillUiEventReported {
- optional UiEventType event_type = 1;
- optional int32 autofill_service_uid = 2 [(is_uid) = true];
- optional int32 app_package_uid = 3 [(is_uid) = true];
-}
-
-/**
- * Log information for Autofill FillRequest. It is logged after a
- * FillRequest is sent to the Autofill provider.
- *
- * Logged from:
- * frameworks/base/services/autofill/java/com/android/server/autofill/
- */
-message AutofillFillRequestReported {
- // Id number which increases for each subsequent request.
- optional int32 request_id = 1;
- // SessionId to aggregate requests within a session, and see overall
- // performance.
- optional int32 session_id = 2;
- // App package Uid
- optional int32 app_package_uid = 11 [(is_uid) = true];
- // Autofill Service Provider's uid
- optional int32 autofill_service_uid = 3 [(is_uid) = true];
- // Inline suggestion host's uid. Populated only when
- // AutofillDisplayPresentationType = INLINE
- optional int32 inline_suggestion_host_uid = 4 [(is_uid) = true];
- // True if the request is augmented.
- optional bool is_augmented = 5;
- // True if the request is a fallback of client suggestion request to the
- // service provider.
- optional bool is_client_suggestion_fallback = 6;
- // True if the request is eligible for fill dialog.
- optional bool is_fill_dialog_eligible = 7;
- optional FillRequestTriggerReason request_trigger_reason = 8;
- optional int64 flags = 9;
- // Timestamp of FillRequest is sent to Autofill provider
- // Latency of framework before provider is called = fillRequestSentTimestampMs
- optional int32 latency_fill_request_sent_millis = 10;
-}
-
-/**
- * Log information for Autofill FillResponse. It is logged after a
- * FillResponse is received from the Autofill provider.
- *
- * Logged from:
- * frameworks/base/services/autofill/java/com/android/server/autofill/
- */
-message AutofillFillResponseReported {
- // Id number which increases for each subsequent request.
- optional int32 request_id = 1;
- // SessionId to aggregate requests within a session, and see overall
- // performance.
- optional int32 session_id = 2;
- // App package uid
- optional int32 app_package_uid = 3 [(is_uid) = true];
- // Tells how the Autofill dataset was/will-be displayed.
- // How the dataset is supposed to be shown to the user
- optional AutofillDisplayPresentationType display_presentation_type = 4;
- // Count of datasets that should've been available for display. If the request
- // times out, this won't be populated.
- optional int32 available_count = 5;
- optional int64 save_ui_trigger_ids = 6;
- // Timestamp of when Autofill provider returns a FillResponse
- // Latency of Autofill provider = fillResponseReceivedTimestampMs -
- // fillRequestSentTimestampMs
- optional int32 latency_fill_response_received_millis = 7;
- optional AuthenticationType authentication_type = 8;
- optional AuthenticationResult authentication_result = 9;
- optional int64 authentication_failure_reason = 10;
- // From response received to authentication UI displayed to the user.
- optional int64 latency_authentication_ui_display_millis = 11;
- // From the user finishing authentication to the dataset is displayed to the user.
- optional int64 latency_dataset_display_millis = 12;
-}
-
-/**
- * Log information for Autofill Save event. It is logged after onSaveRequest
- * is called.
- *
- * Logged from:
- * frameworks/base/services/autofill/java/com/android/server/autofill/
- */
-message AutofillSaveEventReported {
- // Id number which increases for each subsequent request.
- optional int32 request_id = 1;
- // SessionId to aggregate requests within a session, and see overall
- // performance.
- optional int32 session_id = 2;
- // App package uid
- optional int32 app_package_uid = 3 [(is_uid) = true];
- // Same as the one from AutofillPresentationEventReported.
- optional int64 save_ui_trigger_ids = 4;
- optional int64 flag = 5;
- // True if attempting to save a new field, rather than updating an existing one.
- optional bool is_new_field = 6;
-
- optional SaveUiShownReason save_ui_shown_reason = 7;
- optional SaveUiNotShownReason save_ui_not_shown_reason = 8;
-
- optional bool save_button_clicked = 9;
- optional bool cancel_button_clicked = 10;
- optional bool dialog_dismissed = 11;
- optional bool is_saved = 12;
-
- // From framework detected that any of the “savable” fields(during session
- // commitment) were changed to the save UI displayed to the user.
- optional int64 latency_save_ui_display_millis = 13;
- // From the user clicking the “save” button to the framework making the
- // onSave request.
- optional int64 latency_save_request_millis = 14;
- // From onSave request to save is finished.
- optional int64 latency_save_finish_millis = 15;
-}
-
-/**
- * Log information about an Autofill session. It is logged after the session
- * has been committed.
- *
- * Logged from:
- * frameworks/base/services/autofill/java/com/android/server/autofill/
- */
-message AutofillSessionCommitted {
- optional int32 session_id = 1;
- optional int32 component_package_uid = 2;
- optional int64 request_count = 3;
- // Commit reason
- optional AutofillCommitReason commit_reason = 4;
- // Duration of session: Time from session start to session end
- optional int64 session_duration_millis = 5;
-}
diff --git a/stats/enums/autofill/enums.proto b/stats/enums/autofill/enums.proto
deleted file mode 100644
index 130f520..0000000
--- a/stats/enums/autofill/enums.proto
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-syntax = "proto2";
-
-package android.os.statsd.autofill;
-
-option java_outer_classname = "AutofillProtoEnums";
-option java_multiple_files = true;
-
-// Logging constants for Autofill system UI events.
-enum UiEventType {
- TYPE_UNKNOWN = 0;
- // OPEN: Settings > Apps > Default Apps > Default autofill app
- DEFAULT_AUTOFILL_PICKER = 1;
- // ACTION: Update default app from Settings
- ACTION_SETTINGS_UPDATE_DEFAULT_APP = 2;
- // Autofill service called API that disables itself
- AUTOFILL_SERVICE_DISABLED_SELF = 3;
- // An autofill service asked to disable autofill for a given application.
- AUTOFILL_SERVICE_DISABLED_APP = 4;
- // An autofill service asked to disable autofill for a given activity.
- AUTOFILL_SERVICE_DISABLED_ACTIVITY = 5;
- // User manually enable autofill from the denylist for a given app.
- AUTOFILL_ENABLED_FROM_DENYLIST = 6;
- // An app attempted to forge a different component name in the AssisStructure that would be passed to the autofill service.
- AUTOFILL_FORGED_COMPONENT_ATTEMPT = 7;
-}
-
-enum FillRequestTriggerReason {
- TRIGGER_REASON_UNKNOWN = 0;
- // A user or an app explicitly requests The request.
- TRIGGER_REASON_EXPLICITLY_REQUESTED = 1;
- // The request is retriggered by the provider.
- TRIGGER_REASON_RETRIGGER = 2;
- // The request is pre triggered.
- TRIGGER_REASON_PRE_TRIGGER = 3;
- // The request is normally triggered.
- TRIGGER_REASON_NORMAL_TRIGGER = 4;
- // The request is triggered from cached response.
- TRIGGER_REASON_SERVED_FROM_CACHED_RESPONSE = 5;
-}
-
-enum AutofillDisplayPresentationType {
- UNKNOWN_AUTOFILL_DISPLAY_PRESENTATION_TYPE = 0;
- MENU = 1; // aka drop-down
- INLINE = 2; // shown via IME
- DIALOG = 3; // aka Bottom-sheet dialog
-}
-
-enum AuthenticationType {
- AUTHENTICATION_TYPE_UNKNOWN = 0;
- DATASET_AUTHENTICATION = 1;
- FULL_AUTHENTICATION = 2;
-}
-
-enum AuthenticationResult {
- AUTHENTICATION_RESULT_UNKNOWN = 0;
- AUTHENTICATION_SUCCESS = 1;
- AUTHENTICATION_FAILURE = 2;
-}
-
-enum SaveUiShownReason {
- SAVE_UI_SHOWN_REASON_UNKNOWN = 0;
- SAVE_UI_SHOWN_REASON_REQUIRED_ID_CHANGE = 1;
- SAVE_UI_SHOWN_REASON_OPTIONAL_ID_CHANGE = 2;
- SAVE_UI_SHOWN_REASON_TRIGGER_ID_SET = 3;
-}
-
-enum SaveUiNotShownReason {
- NO_SAVE_REASON_UNKNOWN = 0;
- NO_SAVE_REASON_NONE = 1;
- NO_SAVE_REASON_NO_SAVE_INFO = 2;
- NO_SAVE_REASON_WITH_DELAY_SAVE_FLAG = 3;
- NO_SAVE_REASON_HAS_EMPTY_REQUIRED = 4;
- NO_SAVE_REASON_NO_VALUE_CHANGED = 5;
- NO_SAVE_REASON_FIELD_VALIDATION_FAILED = 6;
- NO_SAVE_REASON_DATASET_MATCH = 7;
-}
-
-// Determines the reason for committing the autofill Session.
-enum AutofillCommitReason {
- COMMIT_REASON_UNKNOWN = 0;
- COMMIT_REASON_ACTIVITY_FINISHED = 1;
- COMMIT_REASON_VIEW_COMMITTED = 2;
- COMMIT_REASON_VIEW_CLICKED = 3;
- COMMIT_REASON_VIEW_CHANGED = 4;
-}
