From d6f18466c91de62b2463a25a61d89b3d2b1426ea Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Tue, 27 Jun 2017 10:50:13 +0100 Subject: [PATCH] Workload: Makes APK starting activity optional The starting activity is not always listed in an apk or required to start an application to its default state, for example youtube. Therefore now the starting activity will only be used if one is available. --- wa/framework/workload.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wa/framework/workload.py b/wa/framework/workload.py index 4e2cbf9b..de6f9976 100644 --- a/wa/framework/workload.py +++ b/wa/framework/workload.py @@ -515,9 +515,12 @@ class PackageHandler(object): self.apk_version = host_version def start_activity(self): - cmd = 'am start -W -n {}/{}' - output = self.target.execute(cmd.format(self.apk_info.package, - self.apk_info.activity)) + if not self.apk_info.activity: + cmd = 'am start -W {}'.format(self.apk_info.package) + else: + cmd = 'am start -W -n {}/{}'.format(self.apk_info.package, + self.apk_info.activity) + output = self.target.execute(cmd) if 'Error:' in output: # this will dismiss any error dialogs self.target.execute('am force-stop {}'.format(self.apk_info.package))