Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbc6b663 authored by Todd Poynor's avatar Todd Poynor Committed by Android Git Automerger
Browse files

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

* commit 'da68fd46':
  Android OS battery usage overstated by screen on time
parents 2c49911b da68fd46

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

+2 −1
Original line number Diff line number Diff line
@@ -579,11 +579,12 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable { 
        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;