diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-20 14:10:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-20 14:10:41 -0700 |
| commit | 325192593b057f4360e1abddf490b4fae7d60b12 (patch) | |
| tree | 5a4db76ccecd166dfeedd244ee4d3028fbb7e151 /core | |
| parent | 4d42ccd1579da53aaaf132a6ad26a06e2baa5b98 (diff) | |
| parent | 99d0452ddc0a0435030a462bda9f4d57b58bad9a (diff) | |
| download | frameworks_base-325192593b057f4360e1abddf490b4fae7d60b12.zip frameworks_base-325192593b057f4360e1abddf490b4fae7d60b12.tar.gz frameworks_base-325192593b057f4360e1abddf490b4fae7d60b12.tar.bz2 | |
Merge "Fix a few small battery stats problems:" into gingerbread
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 1 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 95f217f..9fe6e01 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -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()); diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 2a5b944..f4447ab 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -3691,8 +3691,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)); } |