From fcaca1bc15f7a488df67419cf394378e3974bd82 Mon Sep 17 00:00:00 2001 From: Zhen Sun Date: Thu, 7 May 2020 11:49:11 -0700 Subject: [PATCH] Update TvSettingsUIInteracted atom This CL removes the string field from the TvSettingsUIInteracted atom to eliminate the risk of logging sensitive information by accident. This change should be safe as no such log has been uploaded to Google server yet. Besides the change to the atom, this CL also made some corresponding change to the enum file so fill in the information that was collected using a string. (This CL is a mirror of cl/310419842 to Android repo.) Metrics council review bug: 151768952 Bug: 150979527 Test: the Android tree still builds normally Change-Id: I8a9d8c95ec06eaa2cbe097efe652e18d0e7baeac --- cmds/statsd/src/atoms.proto | 3 --- core/proto/android/app/tvsettings_enums.proto | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 4db0f91ca871e..8c5718d30c098 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -9461,9 +9461,6 @@ message TvSettingsUIInteracted { /** The ID of the entry that the users actioned on */ optional android.app.tvsettings.ItemId item_id = 2; - - /** Additional information (e.g., navigation direction on page focused) */ - optional string additional_info = 3; } /** diff --git a/core/proto/android/app/tvsettings_enums.proto b/core/proto/android/app/tvsettings_enums.proto index 30d365c713085..31c5dd6b730ab 100644 --- a/core/proto/android/app/tvsettings_enums.proto +++ b/core/proto/android/app/tvsettings_enums.proto @@ -44,6 +44,24 @@ enum Action { /** Denotes that a toggle is clicked by a user. */ TOGGLE_INTERACTED = 3; + /** + * Denotes that a TvSettings page is being focused in the forward direction + * into the settings tree. + */ + PAGE_FOCUSED_FORWARD = 4; + + /** + * Denotes that a TvSettings page is being focused in the backward direction + * up the settings tree. + */ + PAGE_FOCUSED_BACKWARD = 5; + + /** Denotes that a toggle is turned on by a user. */ + TOGGLED_ON = 6; + + /** Denotes that a toggle is turned off by a user. */ + TOGGLED_OFF = 7; + } /**