diff options
| author | 2016-09-26 17:14:16 +0000 | |
|---|---|---|
| committer | 2016-09-26 17:14:19 +0000 | |
| commit | 99ff7405a3d85e1eb9e64467ab128e289316c5b9 (patch) | |
| tree | c5c6d429cc227cbb9d66ddf26c92e0b1899644a5 | |
| parent | 5ca7164e54cfad2b4edea06a618d73a1ddfcae72 (diff) | |
| parent | 2763c2ba6c41c348920679dac20b7b4cce718408 (diff) | |
Merge "Disable battery saver when booting with sufficient battery" into nyc-mr1-dev
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 570b93c09c9a..01288b81a6c5 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 @@ public final class PowerManagerService extends SystemService } 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(), |