Merge "Add "dock" to cmd battery get/set"

This commit is contained in:
Michael Wachenschwanz
2023-02-13 20:58:46 +00:00
committed by Android (Google) Code Review

View File

@@ -892,9 +892,9 @@ public final class BatteryService extends SystemService {
pw.println("Battery service (battery) commands:");
pw.println(" help");
pw.println(" Print this help text.");
pw.println(" get [-f] [ac|usb|wireless|status|level|temp|present|counter|invalid]");
pw.println(
" set [-f] [ac|usb|wireless|status|level|temp|present|counter|invalid] <value>");
pw.println(" get [-f] [ac|usb|wireless|dock|status|level|temp|present|counter|invalid]");
pw.println(" set [-f] "
+ "[ac|usb|wireless|dock|status|level|temp|present|counter|invalid] <value>");
pw.println(" Force a battery property value, freezing battery state.");
pw.println(" -f: force a battery change broadcast be sent, prints new sequence.");
pw.println(" unplug [-f]");
@@ -954,6 +954,9 @@ public final class BatteryService extends SystemService {
case "wireless":
pw.println(mHealthInfo.chargerWirelessOnline);
break;
case "dock":
pw.println(mHealthInfo.chargerDockOnline);
break;
case "status":
pw.println(mHealthInfo.batteryStatus);
break;
@@ -1008,6 +1011,9 @@ public final class BatteryService extends SystemService {
case "wireless":
mHealthInfo.chargerWirelessOnline = Integer.parseInt(value) != 0;
break;
case "dock":
mHealthInfo.chargerDockOnline = Integer.parseInt(value) != 0;
break;
case "status":
mHealthInfo.batteryStatus = Integer.parseInt(value);
break;
@@ -1085,6 +1091,7 @@ public final class BatteryService extends SystemService {
mHealthInfo.chargerAcOnline = false;
mHealthInfo.chargerUsbOnline = false;
mHealthInfo.chargerWirelessOnline = false;
mHealthInfo.chargerDockOnline = false;
mUpdatesStopped = true;
Binder.withCleanCallingIdentity(() -> processValuesLocked(forceUpdate, pw));
}
@@ -1127,6 +1134,7 @@ public final class BatteryService extends SystemService {
pw.println(" AC powered: " + mHealthInfo.chargerAcOnline);
pw.println(" USB powered: " + mHealthInfo.chargerUsbOnline);
pw.println(" Wireless powered: " + mHealthInfo.chargerWirelessOnline);
pw.println(" Dock powered: " + mHealthInfo.chargerDockOnline);
pw.println(" Max charging current: " + mHealthInfo.maxChargingCurrentMicroamps);
pw.println(" Max charging voltage: " + mHealthInfo.maxChargingVoltageMicrovolts);
pw.println(" Charge counter: " + mHealthInfo.batteryChargeCounterUah);