commit da68fd4620088c1cb3a51cd2064885cbcd1ac621
author Todd Poynor <toddpoynor@google.com> Thu Jan 05 11:21:08 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 05 11:21:08 2012 -0800
tree 4e6ef360bc49132e8926e8ae743aa3261219436c
parent a98c353f8b18607f0c2e9af26b91bf6ffbe8dc78
parent e3b4dfae6f6063ffbcc5d105fa54888b7e3873f7

Merge "Android OS battery usage overstated by screen on time" into ics-mr1

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 6312682..b813ec6 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -579,11 +579,12 @@
         if (osApp != null) {
             long wakeTimeMillis = mStats.computeBatteryUptime(
                     SystemClock.uptimeMillis() * 1000, which) / 1000;
-            wakeTimeMillis -= appWakelockTime - (mStats.getScreenOnTime(
+            wakeTimeMillis -= appWakelockTime + (mStats.getScreenOnTime(
                     SystemClock.elapsedRealtime(), which) / 1000);
             if (wakeTimeMillis > 0) {
                 double power = (wakeTimeMillis
                         * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
+                if (DEBUG) Log.i(TAG, "OS wakeLockTime " + wakeTimeMillis + " power " + power);
                 osApp.wakeLockTime += wakeTimeMillis;
                 osApp.value += power;
                 osApp.values[0] += power;