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

Commit dc152672 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 094b5122 0a269dfe

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

+3 −12
Original line number Original line Diff line number Diff line
@@ -498,7 +498,7 @@ public final class BatteryService extends SystemService { 
        traceEnd();

        traceEnd();

    }

    }





    private static int plugType(HealthInfo healthInfo) {

    private int plugType(HealthInfo healthInfo) {

        if (healthInfo.chargerAcOnline) {

        if (healthInfo.chargerAcOnline) {

            return BatteryManager.BATTERY_PLUGGED_AC;

            return BatteryManager.BATTERY_PLUGGED_AC;

        } else if (healthInfo.chargerUsbOnline) {

        } else if (healthInfo.chargerUsbOnline) {
@@ -507,6 +507,8 @@ public final class BatteryService extends SystemService { 
            return BatteryManager.BATTERY_PLUGGED_WIRELESS;

            return BatteryManager.BATTERY_PLUGGED_WIRELESS;

        } else if (healthInfo.chargerDockOnline) {

        } else if (healthInfo.chargerDockOnline) {

            return BatteryManager.BATTERY_PLUGGED_DOCK;

            return BatteryManager.BATTERY_PLUGGED_DOCK;

        } else if (supplementalOrEmergencyModOnline()) {

            return BatteryManager.BATTERY_PLUGGED_MOD;

        } else {

        } else {

            return BATTERY_PLUGGED_NONE;

            return BATTERY_PLUGGED_NONE;

        }

        }
@@ -520,17 +522,6 @@ public final class BatteryService extends SystemService { 
            mHealthInfo.batteryStatus != BatteryManager.BATTERY_STATUS_UNKNOWN

            mHealthInfo.batteryStatus != BatteryManager.BATTERY_STATUS_UNKNOWN

            && mHealthInfo.batteryLevel <= mCriticalBatteryLevel;

            && mHealthInfo.batteryLevel <= mCriticalBatteryLevel;

        mPlugType = plugType(mHealthInfo);

        mPlugType = plugType(mHealthInfo);

        if (mHealthInfo.chargerAcOnline) {

            mPlugType = BatteryManager.BATTERY_PLUGGED_AC;

        } else if (mHealthInfo.chargerUsbOnline) {

            mPlugType = BatteryManager.BATTERY_PLUGGED_USB;

        } else if (mHealthInfo.chargerWirelessOnline) {

            mPlugType = BatteryManager.BATTERY_PLUGGED_WIRELESS;

        } else if (supplementalOrEmergencyModOnline()) {

            mPlugType = BatteryManager.BATTERY_PLUGGED_MOD;

        } else {

            mPlugType = BATTERY_PLUGGED_NONE;

        }





        if (DEBUG) {

        if (DEBUG) {

            Slog.d(TAG, "Processing new values: "

            Slog.d(TAG, "Processing new values: "