Merge "Disable battery saver when booting with sufficient battery am: 2763c2ba6c am: 994c5722d6" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-09-26 17:34:48 +00:00
committed by Android (Google) Code Review

View File

@@ -810,9 +810,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(),