Update android dumpsys battery to use proto

Use protobuf dumpsys format for parsing battery info using adb.

Change-Id: I83335311b9de44aae2b7fbdcabe2febbf0693c3b
Reviewed-on: https://chromium-review.googlesource.com/c/crossbench/+/6653463
Reviewed-by: Charles Dick <[email protected]>
Commit-Queue: Kameron Lutes <[email protected]>

Author: kalutes

android_protoc/__init__.py

@@ -8,3 +8,5 @@
 
 with android_protoc_in_sys_path():
   from frameworks.base.core.proto.android.server import activitymanagerservice_pb2
+  from frameworks.base.core.proto.android.service import battery_pb2
+  from frameworks.proto_logging.stats.enums.os import enums_pb2

android_protoc/codegen/gen.py

@@ -25,7 +25,9 @@
 # List of modules we want to depend on. We will protoc this module and all its
 # dependencies.
 PROTO_MODULES = [
-    "frameworks.base.core.proto.android.server.activitymanagerservice_pb2"
+    "frameworks.base.core.proto.android.server.activitymanagerservice_pb2",
+    "frameworks.base.core.proto.android.service.battery_pb2",
+    "frameworks.proto_logging.stats.enums.os.enums_pb2",
 ]
 
 # Map of repo name to optional list of folders to sparse checkout

android_protoc/frameworks/base/core/proto/android/service/__init__.py

@@ -26,7 +26,7 @@
 from crossbench.plt.posix import RemotePosixPlatform
 from crossbench.plt.process_meminfo import ProcessMeminfo
 
-from android_protoc import activitymanagerservice_pb2
+from android_protoc import activitymanagerservice_pb2, battery_pb2, enums_pb2
 
 # Defines the Android permissions to be granted.
 # TODO(381985595): make this configurable.
@@ -818,10 +818,11 @@ def python_details(self) -> JsonDict:
   @property
   @override
   def is_battery_powered(self) -> bool:
-    battery_info = self.adb.dumpsys("battery").lower()
-    # Looking for any power source, i.e. 'AC powered: true'
-    has_external_power = " powered: true" in battery_info
-    return not has_external_power
+    battery_info_bytes = self.adb.dumpsys_bytes("battery", "--proto")
+    battery_info = battery_pb2.BatteryServiceDumpProto()
+    battery_info.ParseFromString(battery_info_bytes)
+    return (battery_info.plugged ==
+            enums_pb2.BatteryPluggedStateEnum.BATTERY_PLUGGED_NONE)
 
   @override
   def screenshot(self, result_path: pth.AnyPath) -> None:

android_protoc/frameworks/base/core/proto/android/service/battery_pb2.py

@@ -0,0 +1 @@
+���
 ���	(�Ӛ08
@
HbPdX�hjLi-ion

android_protoc/frameworks/proto_logging/stats/enums/os/__init__.py

@@ -0,0 +1 @@
+(��08
@
HbPdX�hjLi-ion

android_protoc/frameworks/proto_logging/stats/enums/os/enums_pb2.py

@@ -45,13 +45,13 @@
 """
 
 
-def load_dumpsys_meminfo_output():
-  meminfo_result_path = pth.LocalPath(
-      __file__).parent / "pb" / "dumpsys_meminfo.pb"
-  return meminfo_result_path.read_bytes()
+def load_pb(path: str):
+  return (pth.LocalPath(__file__).parent / "pb" / path).read_bytes()
 
 
-DUMPSYS_MEMINFO_OUTPUT = load_dumpsys_meminfo_output()
+DUMPSYS_MEMINFO_OUTPUT = load_pb("dumpsys_meminfo.pb")
+AC_POWERED_OUTPUT = load_pb("battery/ac_powered.pb")
+BATTERY_POWERED_OUTPUT = load_pb("battery/battery_powered.pb")
 
 DUMPSYS_MEMINFO_TIMEOUT_OUTPUT = b'''
 *** SERVICE 'meminfo' DUMP TIMEOUT (1ms) EXPIRED ***
@@ -97,21 +97,10 @@ def test_is_android(self):
     self.assertTrue(self.platform.is_android)
 
   def test_is_battery_powered(self):
-    dumpsys_battery_output = textwrap.dedent("""
-      AC powered: false
-      USB powered: false
-      Wireless powered: true
-      Max charging current: 3000000
-    """)
-    self.expect_sh("dumpsys battery", result=dumpsys_battery_output)
+    self.expect_sh("dumpsys battery --proto", result=AC_POWERED_OUTPUT)
     self.assertFalse(self.platform.is_battery_powered)
-    dumpsys_battery_output = textwrap.dedent("""
-      AC powered: false
-      USB powered: false
-      Wireless powered: false
-      Max charging current: 3000000
-    """)
-    self.expect_sh("dumpsys battery", result=dumpsys_battery_output)
+
+    self.expect_sh("dumpsys battery --proto", result=BATTERY_POWERED_OUTPUT)
     self.assertTrue(self.platform.is_battery_powered)
 
   def test_display_details(self):