diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-16 17:26:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-16 17:26:08 +0000 |
commit | 19f3aab438b0ede9adb9b1a382d44e143de5bd1e (patch) | |
tree | b9a6b60023b853553ae095370bf251a2f1f7640e /catapult/devil/devil/android/app_ui.py | |
parent | f83016a5b126899df6781c1e754c7e9250830b5a (diff) | |
parent | d5085cc096b959470581e35284bcc1d6d58e4cdd (diff) | |
download | chromium-trace-19f3aab438b0ede9adb9b1a382d44e143de5bd1e.tar.gz |
Merge changes I195c394b,Iff693cf6 am: b101eec5e1 am: d5085cc096
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1677030
Change-Id: Ic6e46abeb90a3aec17c6effae79f4f6cb6bd0086
Diffstat (limited to 'catapult/devil/devil/android/app_ui.py')
-rw-r--r-- | catapult/devil/devil/android/app_ui.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/catapult/devil/devil/android/app_ui.py b/catapult/devil/devil/android/app_ui.py index 399c2ee3..4f7af1d7 100644 --- a/catapult/devil/devil/android/app_ui.py +++ b/catapult/devil/devil/android/app_ui.py @@ -51,7 +51,7 @@ class _UiNode(object): A geometry.Rectangle instance. """ d = _RE_BOUNDS.match(self._GetAttribute('bounds')).groupdict() - return geometry.Rectangle.FromDict({k: int(v) for k, v in d.iteritems()}) + return geometry.Rectangle.FromDict({k: int(v) for k, v in d.items()}) def Tap(self, point=None, dp_units=False): """Send a tap event to the UI node. @@ -150,7 +150,7 @@ class _UiNode(object): and ':id/' not in resource_id): kwargs['resource_id'] = '%s:id/%s' % (self._package, resource_id) - criteria = [(k.replace('_', '-'), v) for k, v in kwargs.iteritems() + criteria = [(k.replace('_', '-'), v) for k, v in kwargs.items() if v is not None] if not criteria: raise TypeError('At least one search criteria should be specified') @@ -193,8 +193,12 @@ class AppUi(object): A UI node instance pointing to the root of the xml screenshot. """ with device_temp_file.DeviceTempFile(self._device.adb) as dtemp: - self._device.RunShellCommand(['uiautomator', 'dump', dtemp.name], - check_return=True) + output = self._device.RunShellCommand( + ['uiautomator', 'dump', dtemp.name], single_line=True, + check_return=True) + if output.startswith('ERROR:'): + raise RuntimeError( + 'uiautomator dump command returned error: {}'.format(output)) xml_node = element_tree.fromstring( self._device.ReadFile(dtemp.name, force_pull=True)) return _UiNode(self._device, xml_node, package=self._package) |