commit 2763c2ba6c41c348920679dac20b7b4cce718408
author Michael Wright <michaelwr@google.com> Thu Aug 11 15:45:49 2016 +0100
committer Michael Wright <michaelwr@google.com> Thu Aug 11 15:45:49 2016 +0100
tree a31ea4c3b55be77266f0c73d0cdd61f337cc0486
parent 867f6d5dd544f995036f11bf56c869e50f447263

Disable battery saver when booting with sufficient battery

Bug: 29994369
Change-Id: I01d437c884e62e73dba3c1881544cfc36f953137

services/core/java/com/android/server/power/PowerManagerService.java

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 2824e6e..6045c0c 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -808,9 +808,10 @@
     }
 
     private void updateLowPowerModeLocked() {
-        if (mIsPowered && mLowPowerModeSetting) {
+        if ((mIsPowered || !mBatteryLevelLow && !mBootCompleted) && mLowPowerModeSetting) {
             if (DEBUG_SPEW) {
-                Slog.d(TAG, "updateLowPowerModeLocked: powered, turning setting off");
+                Slog.d(TAG, "updateLowPowerModeLocked: powered or booting with sufficient battery,"
+                        + " turning setting off");
             }
             // Turn setting off if powered
             Settings.Global.putInt(mContext.getContentResolver(),