Merge "Don't log anomaly event_id because it is not a repeated string." into main

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);
     }
 }

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());
     }
 }

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());
     }
 }