am 34594e75: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread

* commit '34594e75e4a7962840f34c0b57116ecf1497f118':
  Fix issue #3177284: Account for wake lock power usage on Crespo
This commit is contained in:
Dianne Hackborn
2010-11-10 18:01:21 -08:00
committed by Android Git Automerger

View File

@@ -46,6 +46,15 @@ public class PowerProfile {
*/
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.
*/