Merge "Update the anomaly type constants" into pi-dev am: 2c8a78a97c

am: 59b393ec4a

Change-Id: I5bf758b946caecb44f9000f14198eccb4f4663a7

2 files changed, 14 insertions, 11 deletions

diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
index 52555783df..451b4029b4 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
@@ -144,7 +144,8 @@ public class AnomalyDetectionJobService extends JobService {
             if (!powerWhitelistBackend.isSysWhitelistedExceptIdle(packageName)
                     && !isSystemUid(uid)) {
                 boolean anomalyDetected = true;
-                if (anomalyInfo.anomalyType == StatsManagerConfig.AnomalyType.EXCESSIVE_BG) {
+                if (anomalyInfo.anomalyType
+                        == StatsManagerConfig.AnomalyType.EXCESSIVE_BACKGROUND_SERVICE) {
                     if (!batteryUtils.isPreOApp(packageName)
                             || !batteryUtils.isAppHeavilyUsed(batteryStatsHelper, userManager, uid,
                             policy.excessiveBgDrainPercentage)) {
diff --git a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java
index 4ae3f10299..7f4b1eb731 100644
--- a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java
+++ b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java
@@ -23,8 +23,6 @@ import com.google.common.hash.Hashing;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * This class provides all the configs needed if we want to use {@link android.app.StatsManager}
@@ -43,16 +41,20 @@ public class StatsManagerConfig {
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({AnomalyType.NULL,
-            AnomalyType.WAKE_LOCK,
-            AnomalyType.WAKEUP_ALARM,
-            AnomalyType.BLUETOOTH_SCAN,
-            AnomalyType.EXCESSIVE_BG})
+            AnomalyType.UNKNOWN_REASON,
+            AnomalyType.EXCESSIVE_WAKELOCK_ALL_SCREEN_OFF,
+            AnomalyType.EXCESSIVE_WAKEUPS_IN_BACKGROUND,
+            AnomalyType.EXCESSIVE_UNOPTIMIZED_BLE_SCAN,
+            AnomalyType.EXCESSIVE_BACKGROUND_SERVICE,
+            AnomalyType.EXCESSIVE_WIFI_SCAN})
     public @interface AnomalyType {
         int NULL = -1;
-        int WAKE_LOCK = 0;
-        int WAKEUP_ALARM = 1;
-        int BLUETOOTH_SCAN = 2;
-        int EXCESSIVE_BG = 3;
+        int UNKNOWN_REASON = 0;
+        int EXCESSIVE_WAKELOCK_ALL_SCREEN_OFF = 1;
+        int EXCESSIVE_WAKEUPS_IN_BACKGROUND = 2;
+        int EXCESSIVE_UNOPTIMIZED_BLE_SCAN = 3;
+        int EXCESSIVE_BACKGROUND_SERVICE = 4;
+        int EXCESSIVE_WIFI_SCAN = 5;
     }
 
 }