From 4919d770f8c437bb638dbb26854b7cde5bbdaed1 Mon Sep 17 00:00:00 2001 From: Michael Wachenschwanz Date: Fri, 10 Feb 2023 19:17:09 -0800 Subject: [PATCH] Add "dock" to `cmd battery get/set` Bug: 256919205 Test: manual (`adb shell cmd battery set dock 1`, `adb shell cmd battery get dock`) Change-Id: I39f0c1d9840046e0907bef352224287775a16284 --- .../java/com/android/server/BatteryService.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java index 54c47b2faec01..669dcfc7424c7 100644 --- a/services/core/java/com/android/server/BatteryService.java +++ b/services/core/java/com/android/server/BatteryService.java @@ -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] "); + 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] "); 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);