commit 701d9a0eea7423702e5fa1a99a90c3b699690068
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 14 18:28:18 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 14 18:28:18 2018 +0000
tree a18b00d353f821d25a2cf731c6a761f3a08ceef1
parent ad2d1b91b69f102cd366d0cbba505e06da89c52b
parent 5f6837ff4625d7bc1fdceb62e543f11e4b0946f2

Merge "Use FIELD_ANOMALY_TYPE instead of FIELD_CONTEXT"

src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java

diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
index f7793aa..2dc35f1 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
@@ -157,7 +157,7 @@
                 metricsFeatureProvider.action(context,
                         MetricsProto.MetricsEvent.ACTION_ANOMALY_IGNORED,
                         packageName,
-                        Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT,
+                        Pair.create(MetricsProto.MetricsEvent.FIELD_ANOMALY_TYPE,
                                 anomalyInfo.anomalyType),
                         Pair.create(MetricsProto.MetricsEvent.FIELD_APP_VERSION_CODE,
                                 versionCode));

tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
index b55bf6b..adee433 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
@@ -178,7 +178,7 @@
         verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
                 MetricsProto.MetricsEvent.ACTION_ANOMALY_IGNORED,
                 SYSTEM_PACKAGE,
-                Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, ANOMALY_TYPE),
+                Pair.create(MetricsProto.MetricsEvent.FIELD_ANOMALY_TYPE, ANOMALY_TYPE),
                 Pair.create(MetricsProto.MetricsEvent.FIELD_APP_VERSION_CODE, VERSION_CODE));
     }