From 6b5273f985cad06e4321d7424b5a8c987fc39e09 Mon Sep 17 00:00:00 2001 From: mxyyiyi Date: Fri, 18 Aug 2023 14:01:08 +0800 Subject: [PATCH] Modify the name of power_anomaly_event enum fields Test: manual Bug: 291689623 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:93112b075979c2829bd3fa14c87160e361f66a82) Change-Id: I1df76167548033887a6227d7b643117c28d68125 --- .../fuelgauge/protos/power_anomaly_event.proto | 10 +++++----- .../android/settings/testutils/BatteryTestUtils.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/fuelgauge/protos/power_anomaly_event.proto b/src/com/android/settings/fuelgauge/protos/power_anomaly_event.proto index a5f475f8e9e..c799d7a29fc 100644 --- a/src/com/android/settings/fuelgauge/protos/power_anomaly_event.proto +++ b/src/com/android/settings/fuelgauge/protos/power_anomaly_event.proto @@ -25,8 +25,8 @@ message PowerAnomalyEvent { // // Next id: 2 enum PowerAnomalyType{ - SETTINGS_BANNER = 0; - APPS_ITEM = 1; + TYPE_SETTINGS_BANNER = 0; + TYPE_APPS_ITEM = 1; } // NOTE: Please DO NOT delete enum items or change enum values. Use [deprecated = true] instead. @@ -34,9 +34,9 @@ enum PowerAnomalyType{ // // Next id: 3 enum PowerAnomalyKey{ - BRIGHTNESS = 0; - SCREEN_TIMEOUT = 1; - APP = 2; + KEY_BRIGHTNESS = 0; + KEY_SCREEN_TIMEOUT = 1; + KEY_APP = 2; } message WarningBannerInfo { diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java index d1d768d1b71..77be0388e58 100644 --- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java @@ -211,8 +211,8 @@ public class BatteryTestUtils { /** Create a power anomaly event proto of adaptive brightness. */ public static PowerAnomalyEvent createAdaptiveBrightnessAnomalyEvent() { return PowerAnomalyEvent.newBuilder() - .setType(PowerAnomalyType.SETTINGS_BANNER) - .setKey(PowerAnomalyKey.BRIGHTNESS) + .setType(PowerAnomalyType.TYPE_SETTINGS_BANNER) + .setKey(PowerAnomalyKey.KEY_BRIGHTNESS) .setWarningBannerInfo(WarningBannerInfo.newBuilder() .setMainButtonDestination(AutoBrightnessSettings.class.getName()) .setMainButtonSourceMetricsCategory(SettingsEnums.SETTINGS_AUTO_BRIGHTNESS) @@ -223,8 +223,8 @@ public class BatteryTestUtils { /** Create a power anomaly event proto of screen timeout. */ public static PowerAnomalyEvent createScreenTimeoutAnomalyEvent() { return PowerAnomalyEvent.newBuilder() - .setType(PowerAnomalyType.SETTINGS_BANNER) - .setKey(PowerAnomalyKey.SCREEN_TIMEOUT) + .setType(PowerAnomalyType.TYPE_SETTINGS_BANNER) + .setKey(PowerAnomalyKey.KEY_SCREEN_TIMEOUT) .setWarningBannerInfo(WarningBannerInfo.newBuilder() .setMainButtonDestination(ScreenTimeoutSettings.class.getName()) .setMainButtonSourceMetricsCategory(SettingsEnums.SCREEN_TIMEOUT)