Merge changes Ie40ff8ae,Iff6eb6de

* changes:
  Add @GuardedBy annotations
  Add support for per process state data to MeasuredEnergyStats

2 files changed, 19 insertions, 1 deletions

diff --git a/core/java/android/os/BatteryConsumer.java b/core/java/android/os/BatteryConsumer.java
index 1c1fc2c96f86..1853c65a299d 100644
--- a/core/java/android/os/BatteryConsumer.java
+++ b/core/java/android/os/BatteryConsumer.java
@@ -174,7 +174,7 @@ public abstract class BatteryConsumer {
     public static final int PROCESS_STATE_BACKGROUND = 2;
     public static final int PROCESS_STATE_FOREGROUND_SERVICE = 3;
 
-    static final int PROCESS_STATE_COUNT = 4;
+    public static final int PROCESS_STATE_COUNT = 4;
 
     private static final String[] sProcessStateNames = new String[PROCESS_STATE_COUNT];
 
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 30613b97f178..da968b378325 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -654,6 +654,24 @@ public abstract class BatteryStats implements Parcelable {
     }
 
     /**
+     * Maps BatteryStats.Uid process state to the BatteryConsumer process state.
+     */
+    public static @BatteryConsumer.ProcessState int
+            mapUidProcessStateToBatteryConsumerProcessState(int processState) {
+        switch (processState) {
+            case BatteryStats.Uid.PROCESS_STATE_TOP:
+                return BatteryConsumer.PROCESS_STATE_FOREGROUND;
+            case BatteryStats.Uid.PROCESS_STATE_BACKGROUND:
+            case BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING:
+                return BatteryConsumer.PROCESS_STATE_BACKGROUND;
+            case BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE:
+                return BatteryConsumer.PROCESS_STATE_FOREGROUND_SERVICE;
+            default:
+                return BatteryConsumer.PROCESS_STATE_ANY;
+        }
+    }
+
+    /**
      * Returns true if battery consumption is tracked on a per-process-state basis.
      */
     public abstract boolean isProcessStateDataAvailable();