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

Commit 9b120352 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Send battery low intent when battery warning boundary changed" am:... 

Merge "Send battery low intent when battery warning boundary changed" am: 7d8f1a76 am: 37ffd54f am: 6a450add

Change-Id: I4bca51da5f2fadd834cb0f573785800eb5898dc1
parents efc8391e 6a450add

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

+4 −1
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ public final class BatteryService extends SystemService { 
    private int mLastInvalidCharger;



    private int mLowBatteryWarningLevel;

    private int mLastLowBatteryWarningLevel;

    private int mLowBatteryCloseWarningLevel;

    private int mShutdownBatteryTemperature;
@@ -314,6 +315,7 @@ public final class BatteryService extends SystemService { 
        final ContentResolver resolver = mContext.getContentResolver();

        int defWarnLevel = mContext.getResources().getInteger(

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

        mLastLowBatteryWarningLevel = mLowBatteryWarningLevel;

        mLowBatteryWarningLevel = Settings.Global.getInt(resolver,

                Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, defWarnLevel);

        if (mLowBatteryWarningLevel == 0) {
@@ -358,7 +360,8 @@ public final class BatteryService extends SystemService { 
        return !plugged

                && mHealthInfo.batteryStatus != BatteryManager.BATTERY_STATUS_UNKNOWN

                && mHealthInfo.batteryLevel <= mLowBatteryWarningLevel

                && (oldPlugged || mLastBatteryLevel > mLowBatteryWarningLevel);

                && (oldPlugged || mLastBatteryLevel > mLowBatteryWarningLevel

                    || mHealthInfo.batteryLevel > mLastLowBatteryWarningLevel);

    }



    private boolean shouldShutdownLocked() {