Merge "Fix 2447470: always update the battery status when it's below the threshold."

1 files changed, 2 insertions, 8 deletions

diff --git a/phone/com/android/internal/policy/impl/KeyguardUpdateMonitor.java b/phone/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
index b7187a4..b7bb184 100644
--- a/phone/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
+++ b/phone/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;
             }
         }