am 83d2698f: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo...

* commit '83d2698f4f271f568333532ddbae33f8e2e13052':
  Fix issue #3177284: Account for wake lock power usage on Crespo

diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index e0d614d..ea28c59 100644 (file)
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -457,6 +457,10 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
             }
             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);