Index: telemetry/telemetry/internal/backends/chrome/android_browser_finder.py |
diff --git a/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py b/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py |
index 5797ef824beb1d799e6f6fa3ebbb375ce2206d33..3eda4a5e8da2c5a4b1cbc9fb1b98284366d9be0a 100644 |
--- a/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py |
+++ b/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py |
@@ -9,6 +9,7 @@ import os |
import sys |
from py_utils import dependency_util |
+from devil import base_error |
from devil.android import apk_helper |
from telemetry.core import exceptions |
@@ -255,5 +256,10 @@ def FindAllAvailableBrowsers(finder_options, device): |
""" |
if not isinstance(device, android_device.AndroidDevice): |
return [] |
- android_platform = platform.GetPlatformForDevice(device, finder_options) |
- return _FindAllPossibleBrowsers(finder_options, android_platform) |
+ |
+ try: |
+ android_platform = platform.GetPlatformForDevice(device, finder_options) |
+ return _FindAllPossibleBrowsers(finder_options, android_platform) |
+ except base_error.BaseError as e: |
+ logging.error('Unable to find browsers on %s: %s', device.device_id, str(e)) |
+ return [] |