summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-20 14:08:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-20 14:08:26 -0700
commite9e23405833a5fedb6a1c2dcec87d84e39d1d13d (patch)
tree57db9e90b120f7a9abc72eebf5a25fa555cc499a /core
parentd5aaff548d62c07fb5fb2d47e58161e77c401616 (diff)
parent266e607bde58aa6ee78ada6e61715c3047568b28 (diff)
downloadframeworks_base-e9e23405833a5fedb6a1c2dcec87d84e39d1d13d.zip
frameworks_base-e9e23405833a5fedb6a1c2dcec87d84e39d1d13d.tar.gz
frameworks_base-e9e23405833a5fedb6a1c2dcec87d84e39d1d13d.tar.bz2
Merge "Fix issue #3113424: Battery stats don't reset on Crespo" into gingerbread
Diffstat (limited to 'core')
-rw-r--r--core/java/com/android/internal/os/BatteryStatsImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 36acb85..bc6d6d2 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -3985,8 +3985,8 @@ public final class BatteryStatsImpl extends BatteryStats {
// we have gone through a significant charge (from a very low
// level to a now very high level).
if (oldStatus == BatteryManager.BATTERY_STATUS_FULL
- || level >= 100
- || (mDischargeCurrentLevel < 20 && level > 90)) {
+ || level >= 95
+ || (mDischargeCurrentLevel < 30 && level >= 90)) {
doWrite = true;
resetAllStatsLocked();
mDischargeStartLevel = level;