am 103b2807: Android OS battery usage overstated by screen on time

* commit '103b28073ace62fe3cca14569bc9807ed7affe88':
  Android OS battery usage overstated by screen on time
This commit is contained in:
Todd Poynor
2011-12-16 18:21:15 -08:00
committed by Android Git Automerger

View File

@@ -579,11 +579,12 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
if (osApp != null) { if (osApp != null) {
long wakeTimeMillis = mStats.computeBatteryUptime( long wakeTimeMillis = mStats.computeBatteryUptime(
SystemClock.uptimeMillis() * 1000, which) / 1000; SystemClock.uptimeMillis() * 1000, which) / 1000;
wakeTimeMillis -= appWakelockTime - (mStats.getScreenOnTime( wakeTimeMillis -= appWakelockTime + (mStats.getScreenOnTime(
SystemClock.elapsedRealtime(), which) / 1000); SystemClock.elapsedRealtime(), which) / 1000);
if (wakeTimeMillis > 0) { if (wakeTimeMillis > 0) {
double power = (wakeTimeMillis double power = (wakeTimeMillis
* mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000; * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
if (DEBUG) Log.i(TAG, "OS wakeLockTime " + wakeTimeMillis + " power " + power);
osApp.wakeLockTime += wakeTimeMillis; osApp.wakeLockTime += wakeTimeMillis;
osApp.value += power; osApp.value += power;
osApp.values[0] += power; osApp.values[0] += power;