diff options
| author | Jim Miller <jaggies@google.com> | 2010-03-02 13:00:17 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-02 13:00:17 -0800 |
| commit | 98f182f78e7dc76039cff4cfe26237e0d9350563 (patch) | |
| tree | 41066b357edfcae5ffeed986b351406147bc1acb | |
| parent | 6019c9d9ca785f83fa9c163e177639381a8beeda (diff) | |
| parent | cdb70af791446f050c3275bd048fe4c630d7e9ea (diff) | |
| download | frameworks_base-98f182f78e7dc76039cff4cfe26237e0d9350563.zip frameworks_base-98f182f78e7dc76039cff4cfe26237e0d9350563.tar.gz frameworks_base-98f182f78e7dc76039cff4cfe26237e0d9350563.tar.bz2 | |
Merge "Fix 2447470: always update the battery status when it's below the threshold."
| -rw-r--r-- | policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java b/policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java index b7187a4..b7bb184 100644 --- a/policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java +++ b/policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java @@ -385,14 +385,8 @@ public class KeyguardUpdateMonitor { } if (!pluggedIn) { - // not plugged in and going below threshold - if (batteryLevel < LOW_BATTERY_THRESHOLD - && mBatteryLevel >= LOW_BATTERY_THRESHOLD) { - return true; - } - // not plugged in and going above threshold (sounds impossible, but, meh...) - if (mBatteryLevel < LOW_BATTERY_THRESHOLD - && batteryLevel >= LOW_BATTERY_THRESHOLD) { + // not plugged in and below threshold + if (batteryLevel < LOW_BATTERY_THRESHOLD && batteryLevel != mBatteryLevel) { return true; } } |