fixup! BatteryService: Add support for battery Moto Mods (0a269dfe) · Commits · e / os / android_frameworks_base

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

+3 −12

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

		private static int plugType(HealthInfo healthInfo) {
		private int plugType(HealthInfo healthInfo) {
		if (healthInfo.chargerAcOnline) {
		return BatteryManager.BATTERY_PLUGGED_AC;
		} else if (healthInfo.chargerUsbOnline) {
		@@ -507,6 +507,8 @@ public final class BatteryService extends SystemService {
		return BatteryManager.BATTERY_PLUGGED_WIRELESS;
		} else if (healthInfo.chargerDockOnline) {
		return BatteryManager.BATTERY_PLUGGED_DOCK;
		} else if (supplementalOrEmergencyModOnline()) {
		return BatteryManager.BATTERY_PLUGGED_MOD;
		} else {
		return BATTERY_PLUGGED_NONE;
		}
		@@ -520,17 +522,6 @@ public final class BatteryService extends SystemService {
		mHealthInfo.batteryStatus != BatteryManager.BATTERY_STATUS_UNKNOWN
		&& mHealthInfo.batteryLevel <= mCriticalBatteryLevel;
		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) {
		Slog.d(TAG, "Processing new values: "