Skip to content

Commit 8154545

Browse files
khokhlov962V8 LUCI CQ
authored andcommitted
Make permission errors non-fatal
Some devices disallow setting app permissions via adb. This CL makes sure that we still can run benchmarks on them. Bug: 427152872 Change-Id: Ibf502b2d44a43457ce394ee39facb37d36c5e210 Reviewed-on: https://chromium-review.googlesource.com/c/crossbench/+/6663058 Reviewed-by: Camillo Bruni <[email protected]> Commit-Queue: Mikhail Khokhlov <[email protected]>
1 parent afb17b3 commit 8154545

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

crossbench/browsers/chromium/webdriver.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from crossbench.helper.path_finder import ChromiumBuildBinaryFinder
2828
from crossbench.parse import NumberParser
2929
from crossbench.plt.android_adb import AndroidAdbPlatform
30+
from crossbench.plt.base import SubprocessError
3031
from crossbench.plt.bin import Binaries
3132
from crossbench.plt.chromeos_ssh import ChromeOsSshPlatform
3233
from crossbench.plt.linux_ssh import LinuxSshPlatform
@@ -113,7 +114,7 @@ def _start_driver(self, session: BrowserSessionRunGroup,
113114
self.adb_force_stop()
114115
if session.browser.wipe_system_user_data:
115116
self.adb_force_clear()
116-
self.platform.adb.grant_permissions(self.android_package)
117+
self._setup_binary_permissions()
117118
self._backup_chrome_flags()
118119
return self._start_chromedriver(session, driver_path)
119120

@@ -187,7 +188,10 @@ def _setup_binary(self) -> None: # pytype: disable=override-error
187188
self._setup_binary_permissions()
188189

189190
def _setup_binary_permissions(self) -> None:
190-
self.platform.adb.grant_permissions(self.android_package)
191+
try:
192+
self.platform.adb.grant_permissions(self.android_package)
193+
except SubprocessError as e:
194+
logging.warning("Error setting app permissions: %s", e)
191195

192196
@override
193197
def _setup_window(self) -> None: # pytype: disable=override-error

0 commit comments

Comments
 (0)