add fallback for screenshot

openatx · Jul 30, 2024 · f2c5d5e · f2c5d5e
1 parent 5f3f142
commit f2c5d5e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/uiautomator2/__init__.py b/uiautomator2/__init__.py
@@ -252,8 +252,12 @@ def screenshot(self, filename: Optional[str] = None, format="pillow", display_id
         """
         if display_id is None:
             base64_data = self.jsonrpc.takeScreenshot(1, 80)
-            jpg_raw = base64.b64decode(base64_data)
-            pil_img = Image.open(io.BytesIO(jpg_raw))
+            # takeScreenshot may return None
+            if base64_data:
+                jpg_raw = base64.b64decode(base64_data)
+                pil_img = Image.open(io.BytesIO(jpg_raw))
+            else:
+                pil_img = self._dev.screenshot(display_id=display_id)
         else:
             pil_img = self._dev.screenshot(display_id=display_id)