commit 83d2698f4f271f568333532ddbae33f8e2e13052
author Dianne Hackborn <hackbod@google.com> Wed Nov 10 17:58:58 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 10 17:58:58 2010 -0800
tree 66fad37535d3b1715e86f43af6574450c9d7338e
parent 91ba0709b032d0c80ca086f53552f251a21c6df4
parent 21023464b23ec43ffbd2f22a09eec2bbd2c70f88

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

src/com/android/settings/fuelgauge/PowerUsageSummary.java

diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index e0d614d..ea28c59 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -457,6 +457,10 @@
             }
             wakelockTime /= 1000; // convert to millis
 
+            // Add cost of holding a wake lock
+            power += (wakelockTime
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
+            
             // Add cost of data traffic
             long tcpBytesReceived = u.getTcpBytesReceived(mStatsType);
             long tcpBytesSent = u.getTcpBytesSent(mStatsType);