From 71adec6dd550b010ca83d695eea822875c55d8d1 Mon Sep 17 00:00:00 2001 From: Zaiyue Xue Date: Thu, 11 Apr 2024 17:26:08 +0800 Subject: [PATCH] Don't log anomaly event_id because it is not a repeated string. Bug: 316075226 Test: presubmit Change-Id: Id0b598b5cbdee15ae11ecf3d8d0dc7b7c67e9f3f --- .../batteryusage/BatteryTipsController.java | 11 ++++++----- .../BatteryTipsCardPreferenceTest.java | 16 ++++++++-------- .../batteryusage/BatteryTipsControllerTest.java | 8 ++++---- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsController.java index 8fa7b903fe8..e22f987c12e 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsController.java @@ -34,6 +34,8 @@ public class BatteryTipsController extends BasePreferenceController { private static final String ROOT_PREFERENCE_KEY = "battery_tips_category"; private static final String CARD_PREFERENCE_KEY = "battery_tips_card"; + @VisibleForTesting static final String ANOMALY_KEY = "anomaly_key"; + private final MetricsFeatureProvider mMetricsFeatureProvider; /** A callback listener for the battery tips is confirmed. */ @@ -94,7 +96,7 @@ public class BatteryTipsController extends BasePreferenceController { /* attribution= */ SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, /* action= */ SettingsEnums.ACTION_BATTERY_TIPS_CARD_ACCEPT, /* pageId= */ SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - /* key= */ mAnomalyEventWrapper.getEventId(), + /* key= */ ANOMALY_KEY, /* value= */ mAnomalyEventWrapper.getAnomalyKeyNumber()); } @@ -107,7 +109,6 @@ public class BatteryTipsController extends BasePreferenceController { return; } - final String eventId = mAnomalyEventWrapper.getEventId(); final int anomalyKeyNumber = mAnomalyEventWrapper.getAnomalyKeyNumber(); // Update card & buttons preference @@ -127,7 +128,7 @@ public class BatteryTipsController extends BasePreferenceController { /* attribution= */ SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, /* action= */ SettingsEnums.ACTION_BATTERY_TIPS_CARD_ACCEPT, /* pageId= */ SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - /* key= */ eventId, + /* key= */ ANOMALY_KEY, /* value= */ anomalyKeyNumber); } }); @@ -147,7 +148,7 @@ public class BatteryTipsController extends BasePreferenceController { /* attribution= */ SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, /* action= */ SettingsEnums.ACTION_BATTERY_TIPS_CARD_DISMISS, /* pageId= */ SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - /* key= */ eventId, + /* key= */ ANOMALY_KEY, /* value= */ anomalyKeyNumber); }); @@ -156,7 +157,7 @@ public class BatteryTipsController extends BasePreferenceController { /* attribution= */ SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, /* action= */ SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, /* pageId= */ SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - /* key= */ eventId, + /* key= */ ANOMALY_KEY, /* value= */ anomalyKeyNumber); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java index b0bf2415334..3ce3305c8fa 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java @@ -124,14 +124,14 @@ public final class BatteryTipsCardPreferenceTest { SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "BrightnessAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_BRIGHTNESS.getNumber()); verify(mFeatureFactory.metricsFeatureProvider) .action( SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_ACCEPT, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "BrightnessAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_BRIGHTNESS.getNumber()); } @@ -156,14 +156,14 @@ public final class BatteryTipsCardPreferenceTest { SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "ScreenTimeoutAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_SCREEN_TIMEOUT.getNumber()); verify(mFeatureFactory.metricsFeatureProvider) .action( SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_DISMISS, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "ScreenTimeoutAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_SCREEN_TIMEOUT.getNumber()); } @@ -188,14 +188,14 @@ public final class BatteryTipsCardPreferenceTest { SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "AppAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_APP_TOTAL_HIGHER_THAN_USUAL.getNumber()); verify(mFeatureFactory.metricsFeatureProvider) .action( SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_ACCEPT, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "AppAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_APP_TOTAL_HIGHER_THAN_USUAL.getNumber()); } @@ -219,14 +219,14 @@ public final class BatteryTipsCardPreferenceTest { SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "AppAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_APP_TOTAL_HIGHER_THAN_USUAL.getNumber()); verify(mFeatureFactory.metricsFeatureProvider) .action( SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_DISMISS, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "AppAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_APP_TOTAL_HIGHER_THAN_USUAL.getNumber()); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java index 879a5c1cc63..954437f6440 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java @@ -94,7 +94,7 @@ public final class BatteryTipsControllerTest { SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "BrightnessAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_BRIGHTNESS.getNumber()); } @@ -117,7 +117,7 @@ public final class BatteryTipsControllerTest { SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "ScreenTimeoutAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_SCREEN_TIMEOUT.getNumber()); } @@ -148,7 +148,7 @@ public final class BatteryTipsControllerTest { SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "ScreenTimeoutAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_SCREEN_TIMEOUT.getNumber()); } @@ -174,7 +174,7 @@ public final class BatteryTipsControllerTest { SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, SettingsEnums.ACTION_BATTERY_TIPS_CARD_SHOW, SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL, - "AppAnomaly", + BatteryTipsController.ANOMALY_KEY, PowerAnomalyKey.KEY_APP_TOTAL_HIGHER_THAN_USUAL.getNumber()); } }