Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread
diff --git a/core/java/com/android/internal/os/PowerProfile.java b/core/java/com/android/internal/os/PowerProfile.java
index 127ed68..99a6843 100644
--- a/core/java/com/android/internal/os/PowerProfile.java
+++ b/core/java/com/android/internal/os/PowerProfile.java
@@ -47,6 +47,15 @@
public static final String POWER_CPU_IDLE = "cpu.idle";
/**
+ * Power consumption when CPU is awake (when a wake lock is held). This
+ * should be 0 on devices that can go into full CPU power collapse even
+ * when a wake lock is held. Otherwise, this is the power consumption in
+ * addition to POWERR_CPU_IDLE due to a wake lock being held but with no
+ * CPU activity.
+ */
+ public static final String POWER_CPU_AWAKE = "cpu.awake";
+
+ /**
* Power consumption when CPU is in power collapse mode.
*/
public static final String POWER_CPU_ACTIVE = "cpu.active";