Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ae96a6d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cap the low battery threshold at config_lowBatteryWarningLevel (=15)"

parents ac3dbf48 965419af

services/core/java/com/android/server/BatteryService.java

+5 −2
Original line number Diff line number Diff line
@@ -293,10 +293,13 @@ public final class BatteryService extends SystemService { 


    private void updateBatteryWarningLevelLocked() {

        final ContentResolver resolver = mContext.getContentResolver();

        int defWarnLevel = mContext.getResources().getInteger(

        final int defWarnLevel = mContext.getResources().getInteger(

                com.android.internal.R.integer.config_lowBatteryWarningLevel);

        mLowBatteryWarningLevel = Settings.Global.getInt(resolver,

        final int lowPowerModeTriggerLevel = Settings.Global.getInt(resolver,

                Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, defWarnLevel);



        mLowBatteryWarningLevel = Math.min(defWarnLevel, lowPowerModeTriggerLevel);



        if (mLowBatteryWarningLevel == 0) {

            mLowBatteryWarningLevel = defWarnLevel;

        }