am 969773aa: am 83d2698f: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread

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

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);