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

Commit a3ece8bd authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 32519259: Merge "Fix a few small battery stats problems:" into gingerbread 

Merge commit '32519259' into gingerbread-plus-aosp

* commit '32519259':
  Fix a few small battery stats problems:
parents 005f0d08 32519259

core/java/android/os/BatteryStats.java

+1 −0
Original line number Diff line number Diff line
@@ -1400,6 +1400,7 @@ public abstract class BatteryStats implements Parcelable { 
                        pw.println(getDischargeStartLevel());

                pw.print(prefix); pw.print("    Discharge cycle current level: ");

                        pw.println(getDischargeCurrentLevel());

            } else {

                pw.print(prefix); pw.println("  Device is currently plugged into power");

                pw.print(prefix); pw.print("    Last discharge cycle start level: "); 

                        pw.println(getDischargeStartLevel());

core/java/com/android/internal/os/BatteryStatsImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -3693,8 +3693,8 @@ public final class BatteryStatsImpl extends BatteryStats { 
                mTrackBatteryPastRealtime += realtime - mTrackBatteryRealtimeStart;

                mDischargeCurrentLevel = level;

                if (level < mDischargeUnplugLevel) {

                    mLowDischargeAmountSinceCharge = mDischargeUnplugLevel-level-1;

                    mHighDischargeAmountSinceCharge = mDischargeUnplugLevel-level;

                    mLowDischargeAmountSinceCharge += mDischargeUnplugLevel-level-1;

                    mHighDischargeAmountSinceCharge += mDischargeUnplugLevel-level;

                }

                doPlugLocked(getBatteryUptimeLocked(uptime), getBatteryRealtimeLocked(realtime));

            }