From 07d34e5615c7f9b31623b30765b883643150b113 Mon Sep 17 00:00:00 2001
From: Sebastian Goscik <sebastian.goscik@live.co.uk>
Date: Wed, 24 Aug 2016 14:28:53 +0100
Subject: [PATCH 1/4] ApkWorkload: Moved APK resolution into setup

Previously if you had multiple versions of the same workload in one
agenda only the first one would work, the others would fail to find
their APK.
---
 wlauto/common/android/workload.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wlauto/common/android/workload.py b/wlauto/common/android/workload.py
index 21ce3d56..6be34ace 100644
--- a/wlauto/common/android/workload.py
+++ b/wlauto/common/android/workload.py
@@ -179,7 +179,7 @@ class ApkWorkload(Workload):
         self.apk_version = None
         self.logcat_log = None
 
-    def initialize(self, context):
+    def setup(self, context):
         # Get APK for the correct version and device ABI
         self.apk_file = context.resolver.get(ApkFile(self, self.device.abi),
                                              version=getattr(self, 'version', None),
@@ -194,7 +194,6 @@ class ApkWorkload(Workload):
             if self.force_install:
                 raise ConfigError('force_install cannot be "True" when check_apk is set to "False".')
 
-    def setup(self, context):
         self.initialize_package(context)
         self.launch_package()
         self.device.execute('am kill-all')  # kill all *background* activities
@@ -525,7 +524,7 @@ class GameWorkload(ApkWorkload, ReventWorkload):
     def init_resources(self, context):
         ApkWorkload.init_resources(self, context)
         ReventWorkload.init_resources(self, context)
-        if self.check_states:        
+        if self.check_states:
             self._check_statedetection_files(self, context)
 
     def setup(self, context):

From b426e00f2fd98bc602b40bec815847c6287b610a Mon Sep 17 00:00:00 2001
From: Sebastian Goscik <sebastian.goscik@live.co.uk>
Date: Wed, 24 Aug 2016 14:33:18 +0100
Subject: [PATCH 2/4] Updated workload versions to match APK files

Some workloads presented a different version than what was in the APK file.
With the changes introduced in bb33123 several workloads broke.
---
 wlauto/workloads/antutu/__init__.py           |   2 +-
 .../antutu/com.arm.wlauto.uiauto.antutu.jar   | Bin 6139 -> 10254 bytes
 .../com/arm/wlauto/uiauto/UiAutomation.java   |   4 ++--
 wlauto/workloads/geekbench/__init__.py        |  16 +++++++++-------
 .../com.arm.wlauto.uiauto.geekbench.jar       | Bin 3523 -> 7822 bytes
 .../com/arm/wlauto/uiauto/UiAutomation.java   |  10 +++++-----
 wlauto/workloads/glbenchmark/__init__.py      |  14 +++++++-------
 .../glbenchmark/com.arm.wlauto.uiauto.glb.jar | Bin 4629 -> 8786 bytes
 .../com/arm/wlauto/uiauto/UiAutomation.java   |  14 +++++++-------
 9 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/wlauto/workloads/antutu/__init__.py b/wlauto/workloads/antutu/__init__.py
index f863148f..86d67565 100644
--- a/wlauto/workloads/antutu/__init__.py
+++ b/wlauto/workloads/antutu/__init__.py
@@ -47,7 +47,7 @@ class Antutu(AndroidUiAutoBenchmark):
     activity = ".ABenchMarkStart"
     summary_metrics = ['score', 'Overall_Score']
 
-    valid_versions = ['3.3.2', '4.0.3', '5.3.0', '6.0.1']
+    valid_versions = ['3.3.2', '4.0.3', '5.3', '6.0.1']
 
     device_prefs_directory = '/data/data/com.antutu.ABenchMark/shared_prefs'
     device_prefs_file = '/'.join([device_prefs_directory, 'com.antutu.ABenchMark_preferences.xml'])
diff --git a/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar b/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar
index 4aecde1da3e8bc38c92f2c4d5cd50675ae34b59e..7c83ec3b8b7a33c186b71bc7c205bd063e98e272 100644
GIT binary patch
delta 10101
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
QgPW7)Dd;g|SpO6L4~TN(4FCWD

delta 5953
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
j001a0000XB0000000000005+cx0C889tJNL00000?Ny@&

diff --git a/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
index 4d7a08d1..fc44e9a3 100644
--- a/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
+++ b/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
@@ -66,7 +66,7 @@ public class UiAutomation extends BaseUiAutomation {
             while (true) {
                     if(version.equals("6.0.1"))
                         hitTestButtonVersion5(TestButton6);
-                    else if (version.equals("5.3.0")) {
+                    else if (version.equals("5.3")) {
                         hitTestButton();
                         hitTestButtonVersion5(TestButton5);
                     }
@@ -308,7 +308,7 @@ public class UiAutomation extends BaseUiAutomation {
 
     public void returnToTestScreen(String version) throws Exception {
         getUiDevice().pressBack();
-        if (version.equals("5.3.0"))
+        if (version.equals("5.3"))
         {
             UiSelector selector = new UiSelector();
             UiObject detailsButton = new UiObject(new UiSelector().className("android.widget.Button")
diff --git a/wlauto/workloads/geekbench/__init__.py b/wlauto/workloads/geekbench/__init__.py
index 8d484cc2..b7dc7a9f 100644
--- a/wlauto/workloads/geekbench/__init__.py
+++ b/wlauto/workloads/geekbench/__init__.py
@@ -59,11 +59,11 @@ class Geekbench(AndroidUiAutoBenchmark):
     """
     summary_metrics = ['score', 'multicore_score']
     versions = {
-        '3': {
+        '3.0.0': {
             'package': 'com.primatelabs.geekbench3',
             'activity': '.HomeActivity',
         },
-        '2': {
+        '2.2.7': {
             'package': 'ca.primatelabs.geekbench2',
             'activity': '.HomeActivity',
         },
@@ -95,7 +95,7 @@ class Geekbench(AndroidUiAutoBenchmark):
         self.run_timeout = 5 * 60 * self.times
 
     def initialize(self, context):
-        if self.version == '3' and not self.device.is_rooted:
+        if self.version == '3.0.0' and not self.device.is_rooted:
             raise WorkloadError('Geekbench workload only works on rooted devices.')
 
     def init_resources(self, context):
@@ -108,12 +108,14 @@ class Geekbench(AndroidUiAutoBenchmark):
 
     def update_result(self, context):
         super(Geekbench, self).update_result(context)
-        update_method = getattr(self, 'update_result_{}'.format(self.version))
-        update_method(context)
+        if self.version == "2.2.7":
+            self.update_result_2(context)
+        else:
+            self.update_result_3(context)
 
     def validate(self):
-        if (self.times > 1) and (self.version == '2'):
-            raise ConfigError('times parameter is not supported for version 2 of Geekbench.')
+        if (self.times > 1) and (self.version == '2.2.7'):
+            raise ConfigError('times parameter is not supported for version 2.2.7 of Geekbench.')
 
     def update_result_2(self, context):
         score_calculator = GBScoreCalculator()
diff --git a/wlauto/workloads/geekbench/com.arm.wlauto.uiauto.geekbench.jar b/wlauto/workloads/geekbench/com.arm.wlauto.uiauto.geekbench.jar
index 5359cc30c8eb8f8c36d947edd340367d949f11e6..deec40bd9f0d345673b91d98b81978a87862afff 100644
GIT binary patch
delta 7674
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

delta 3333
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
PyOU}j9tQUe00000hU`}>

diff --git a/wlauto/workloads/geekbench/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/geekbench/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
index 968d2abc..2ef4b9ea 100644
--- a/wlauto/workloads/geekbench/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
+++ b/wlauto/workloads/geekbench/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
@@ -32,26 +32,26 @@ import com.android.uiautomator.testrunner.UiAutomatorTestCase;
 
 import com.arm.wlauto.uiauto.BaseUiAutomation;
 
-public class UiAutomation extends BaseUiAutomation {   
+public class UiAutomation extends BaseUiAutomation {
 
     public static String TAG = "geekbench";
 
     public void runUiAutomation() throws Exception {
         Bundle params = getParams();
-        int version = Integer.parseInt(params.getString("version"));
+        String version = params.getString("version");
         int times = Integer.parseInt(params.getString("times"));
 
         for (int i = 0; i < times; i++) {
                 runBenchmarks();
-                switch(version) {
-                case 2: 
+                if(version.equals("2.2.7")) {
                         // In version 2, we scroll through the results WebView to make sure
                         // all results appear on the screen, which causes them to be dumped into
                         // logcat by the Linaro hacks.
                         waitForResultsv2();
                         scrollThroughResults();
                         break;
-                case 3: 
+                }
+                else if(version.equals("3.0.0")) {
                         // Attempting to share the results will generate the .gb3 file with
                         // results that can then be pulled from the device. This is not possible
                         // in verison 2 of Geekbench (Share option was added later).
diff --git a/wlauto/workloads/glbenchmark/__init__.py b/wlauto/workloads/glbenchmark/__init__.py
index d8206cc2..0e54e149 100644
--- a/wlauto/workloads/glbenchmark/__init__.py
+++ b/wlauto/workloads/glbenchmark/__init__.py
@@ -57,14 +57,14 @@ class Glb(AndroidUiAutoBenchmark):
     view = 'com.glbenchmark.glbenchmark27/com.glbenchmark.activities.GLBRender'
 
     packages = {
-        '2.7.0': 'com.glbenchmark.glbenchmark27',
-        '2.5.1': 'com.glbenchmark.glbenchmark25',
+        '2.7': 'com.glbenchmark.glbenchmark27',
+        '2.5': 'com.glbenchmark.glbenchmark25',
     }
     # If usecase is not specified the default usecase is the first supported usecase alias
     # for the specified version.
     supported_usecase_aliases = {
-        '2.7.0': ['t-rex', 'egypt'],
-        '2.5.1': ['egypt-classic', 'egypt'],
+        '2.7': ['t-rex', 'egypt'],
+        '2.5': ['egypt-classic', 'egypt'],
     }
 
     default_iterations = 1
@@ -73,15 +73,15 @@ class Glb(AndroidUiAutoBenchmark):
     regex = re.compile(r'GLBenchmark (metric|FPS): (.*)')
 
     parameters = [
-        Parameter('version', default='2.7.0', allowed_values=['2.7.0', '2.5.1'],
+        Parameter('version', default='2.7', allowed_values=['2.7', '2.5'],
                   description=('Specifies which version of the benchmark to run (different versions '
                                'support different use cases).')),
         Parameter('use_case', default=None,
                   description="""Specifies which usecase to run, as listed in the benchmark menu; e.g.
                                  ``'GLBenchmark 2.5 Egypt HD'``. For convenience, two aliases are provided
                                  for the most common use cases: ``'egypt'`` and ``'t-rex'``. These could
-                                 be use instead of the full use case title. For version ``'2.7.0'`` it defaults
-                                 to ``'t-rex'``, for version ``'2.5.1'`` it defaults to ``'egypt-classic'``.
+                                 be use instead of the full use case title. For version ``'2.7'`` it defaults
+                                 to ``'t-rex'``, for version ``'2.5'`` it defaults to ``'egypt-classic'``.
                   """),
         Parameter('variant', default='onscreen',
                   description="""Specifies which variant of the use case to run, as listed in the benchmarks
diff --git a/wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glb.jar b/wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glb.jar
index 57d0fb1e843c52d88d0035312d37857bc561d0d1..71773c9ba72895f7a8f4aac43a193fead3c0b872 100644
GIT binary patch
delta 8645
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
O#49W^_z=qfwEqRi|I<zY

delta 4456
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

diff --git a/wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
index 2c244d64..22d0c0f0 100644
--- a/wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
+++ b/wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
@@ -33,7 +33,7 @@ import com.android.uiautomator.testrunner.UiAutomatorTestCase;
 
 import com.arm.wlauto.uiauto.BaseUiAutomation;
 
-public class UiAutomation extends BaseUiAutomation {   
+public class UiAutomation extends BaseUiAutomation {
 
     public static String TAG = "glb";
     public static int maxScrolls = 15;
@@ -63,7 +63,7 @@ public class UiAutomation extends BaseUiAutomation {
                 extractResults();
                 iterations -= 1;
         }
-        
+
         Bundle status = new Bundle();
         getAutomationSupport().sendStatus(Activity.RESULT_OK, status);
     }
@@ -81,9 +81,9 @@ public class UiAutomation extends BaseUiAutomation {
         UiObject useCaseText = new UiObject(selector.className("android.widget.TextView")
                                                     .text(useCase)
                                            );
-        if (version.equals("2.7.0")){
+        if (version.equals("2.7")){
                 UiObject variantText =  useCaseText.getFromParent(selector.className("android.widget.TextView")
-                                                                          .text(variant));    
+                                                                          .text(variant));
                 int scrolls = 0;
                 while(!variantText.exists()) {
                         testList.scrollForward();
@@ -94,7 +94,7 @@ public class UiAutomation extends BaseUiAutomation {
                 }
                 variantText.click();
         }
-        else if (version.equals("2.5.1")){
+        else if (version.equals("2.5")){
                 int scrolls = 0;
                 while(!useCaseText.exists()) {
                         testList.scrollForward();
@@ -123,7 +123,7 @@ public class UiAutomation extends BaseUiAutomation {
     public void waitForResults(String version, String useCase, int timeout) throws Exception {
         UiSelector selector = new UiSelector();
         UiObject results = null;
-        if (version.equals("2.7.0"))
+        if (version.equals("2.7"))
                 results = new UiObject(selector.text("Results").className("android.widget.TextView"));
         else
                 results =  new UiObject(selector.text(useCase).className("android.widget.TextView"));
@@ -135,7 +135,7 @@ public class UiAutomation extends BaseUiAutomation {
 	// starting GLB.
         if (!results.waitForExists(TimeUnit.SECONDS.toMillis(timeout))) {
 		Log.v(TAG, "Results screen not found. Attempting to bring to foreground.");
-		String[] commandLine = {"am", "start", 
+		String[] commandLine = {"am", "start",
 					"-a", "android.intent.action.MAIN",
 					"-c", "android.intent.category.LAUNCHER",
 					"-n", "com.glbenchmark.glbenchmark27/com.glbenchmark.activities.GLBenchmarkDownloaderActivity"};

From 9d4aa4983aef3474804f38730b2cc390653db1f5 Mon Sep 17 00:00:00 2001
From: Sebastian Goscik <sebastian.goscik@live.co.uk>
Date: Wed, 24 Aug 2016 14:36:00 +0100
Subject: [PATCH 3/4] antutu: Fixed setting permissions

It has been observed on some devices that the FINE_LOCATION premissions is required
for antutu to run without asking for permissions at run time but this was not listed
in the APK manifest. This caused issues on devices were only the permissions in the
manifest can be granted. This commit sliences any error when trying to set this permission
as well as only trying only on Android 6+
---
 wlauto/workloads/antutu/__init__.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wlauto/workloads/antutu/__init__.py b/wlauto/workloads/antutu/__init__.py
index 86d67565..13cffa73 100644
--- a/wlauto/workloads/antutu/__init__.py
+++ b/wlauto/workloads/antutu/__init__.py
@@ -17,6 +17,7 @@ import os
 from collections import defaultdict, OrderedDict
 
 from wlauto import AndroidUiAutoBenchmark, Parameter, File
+from wlauto.exceptions import DeviceError
 from wlauto.utils.android import ApkInfo
 
 
@@ -80,8 +81,12 @@ class Antutu(AndroidUiAutoBenchmark):
             info = ApkInfo(antutu_3d)
             if not context.device.is_installed(info.package):
                 self.device.install_apk(antutu_3d, timeout=120)
-            # Antutu doesnt seem to list this as one of its permissions, but it asks for it.
-            self.device.execute("pm grant com.antutu.ABenchMark android.permission.ACCESS_FINE_LOCATION")
+            if self.device.get_sdk_version() >= 23:
+                # Antutu doesnt seem to list this as one of its permissions, but on some devices it asks for it.
+                try:
+                    self.device.execute("pm grant com.antutu.ABenchMark android.permission.ACCESS_FINE_LOCATION")
+                except DeviceError:
+                    self.logger.debug("failed to grant ACCESS_FINE_LOCATION, continuing")
         super(Antutu, self).setup(context)
 
     def update_result(self, context):

From 8e27794124aa706a3a58db65831147ba903bf529 Mon Sep 17 00:00:00 2001
From: Sebastian Goscik <sebastian.goscik@live.co.uk>
Date: Wed, 24 Aug 2016 15:30:18 +0100
Subject: [PATCH 4/4] Added a script to check APK/Workload versions for
 inconsistencies

---
 dev_scripts/README             |  5 +++
 dev_scripts/check_apk_versions | 66 ++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 dev_scripts/check_apk_versions

diff --git a/dev_scripts/README b/dev_scripts/README
index 6ea0e95c..5332b33f 100644
--- a/dev_scripts/README
+++ b/dev_scripts/README
@@ -6,6 +6,11 @@ distributed as part of WA releases.
 Scripts
 -------
 
+:check_apk_versions: Compares WA workload versions with the versions listed in APK
+                     if there are any incistency it will highlight these. This 
+                     requires all APK files to be present for workloads with 
+                     versions.
+
 :clean_install: Performs a clean install of WA from source. This will remove any
                 existing WA install (regardless of whether it was made from
                 source or through a tarball with pip).
diff --git a/dev_scripts/check_apk_versions b/dev_scripts/check_apk_versions
new file mode 100644
index 00000000..4636caa2
--- /dev/null
+++ b/dev_scripts/check_apk_versions
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+import os
+from distutils.version import StrictVersion
+
+from wlauto.core.extension_loader import ExtensionLoader
+from wlauto.common.android.workload import ApkWorkload
+from wlauto.utils.android import ApkInfo
+
+el = ExtensionLoader()
+
+
+class fake_config(object):
+    def __init__(self, ext_loader):
+        self.ext_loader = ext_loader
+        self.get_extension = ext_loader.get_extension
+
+
+class fake_device(object):
+    platform = "android"
+
+config = fake_config(el)
+device = fake_device()
+
+if "WA_USER_DIRECTORY" in os.environ:
+    base_path = os.environ["WA_USER_DIRECTORY"]
+else:
+    base_path = "~/.workload_automation/dependencies/"
+
+apk_workloads = [e for e in el.list_workloads()
+                 if issubclass(el.get_extension_class(e.name), ApkWorkload)]
+
+for wl in apk_workloads:
+    # Get versions from workloads
+    workload_versions = []
+    for p in wl.parameters:
+        if p.name == "version" and p.allowed_values:
+            workload_versions = p.allowed_values
+            break
+    else:
+        continue
+
+    dep_path = os.path.join(os.path.expanduser(base_path), wl.name)
+    apks = [apk for apk in os.listdir(dep_path) if apk.endswith(".apk")]
+
+    # Get versions from APK files
+    apk_versions = []
+    for apk in apks:
+        # skip antutu 3d benchmark apk
+        if apk == "com.antutu.benchmark.full-1.apk":
+            continue
+        apk_versions.append(ApkInfo(os.path.join(dep_path, apk)).version_name)
+
+    # Output workload info
+    print "Workload:          {}".format(wl.name)
+    print "Workload Versions: {}".format(sorted(workload_versions, key=StrictVersion))
+    print "APK versions:      {}".format(sorted(apk_versions, key=StrictVersion))
+
+    # Check for bad/missing versions
+    error = False
+    for v in apk_versions:
+        if v not in workload_versions:
+            msg = "APK version '{}' not present in workload list of versions"
+            print msg.format(v)
+            error = True
+    if not error:
+        print "OK"