Bugreport

src/tools/interop/idt/capture/platform/android/android.py

@@ -16,12 +16,14 @@
 #
 
 import ipaddress
+import os
 import traceback
 import typing
 
 from capture import log_format
 from capture.base import PlatformLogStreamer
 from capture.shell_utils import Bash
+from . import config
 from . import streams
 from .capabilities import Capabilities
 
@@ -179,6 +181,7 @@ async def connect(self) -> None:
     async def handle_stream_action(self, action: str) -> None:
         had_error = False
         for stream_name, stream in self.streams.items():
+            self.logger.info(f"Doing {action} for {stream_name}!")
             try:
                 await getattr(stream, action)()
             except:
@@ -192,3 +195,15 @@ async def start_streaming(self) -> None:
 
     async def stop_streaming(self) -> None:
         await self.handle_stream_action("stop")
+        if config.enable_bug_report:
+            found = False
+            for item in os.listdir(self.artifact_dir):
+                if "bugreport" in item and ".zip" in item:
+                    found = True
+            if not found:
+                self.logger.info("Taking bugreport")
+                self.run_adb_command("bugreport", cwd=self.artifact_dir)
+            else:
+                self.logger.warning("bugreport already taken")
+        else:
+            self.logger.critical("bugreport disabled in settings!")

src/tools/interop/idt/capture/platform/android/config.py

@@ -16,3 +16,4 @@
 #
 
 enable_build_push_tcpdump = True
+enable_bug_report = True