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

Commit 32519259 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents 4d42ccd1 99d0452d

core/java/android/os/BatteryStats.java

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

                        pw.println(getDischargeStartLevel());

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

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

                        pw.println(getDischargeCurrentLevel());

                        pw.println(getDischargeCurrentLevel());

            } else {

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

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

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

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

                        pw.println(getDischargeStartLevel());

                        pw.println(getDischargeStartLevel());

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

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

                mTrackBatteryPastRealtime += realtime - mTrackBatteryRealtimeStart;

                mDischargeCurrentLevel = level;

                mDischargeCurrentLevel = level;

                if (level < mDischargeUnplugLevel) {

                if (level < mDischargeUnplugLevel) {

                    mLowDischargeAmountSinceCharge = mDischargeUnplugLevel-level-1;

                    mLowDischargeAmountSinceCharge += mDischargeUnplugLevel-level-1;

                    mHighDischargeAmountSinceCharge = mDischargeUnplugLevel-level;

                    mHighDischargeAmountSinceCharge += mDischargeUnplugLevel-level;

                }

                }

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

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

            }

            }