Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6007206 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 63f40387: am 34594e75: Merge "Fix issue #3177284: Account for wake lock... 

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

* commit '63f40387':
  Fix issue #3177284: Account for wake lock power usage on Crespo
parents f0504eb4 63f40387

core/java/com/android/internal/os/PowerProfile.java

+9 −0
Original line number Diff line number Diff line
@@ -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.

     */