Fix to allow for android version browser differences

Author: mhkarsten

AndroidRunner/Browsers/Chrome.py

@@ -2,7 +2,10 @@
 
 
 class Chrome(Browser):
-    def __init__(self):
+    def __init__(self, device=None):
         # https://stackoverflow.com/a/28151563
-        super(Chrome, self).__init__('com.android.chrome', 'com.google.android.apps.chrome.Main')
+        if device != None and int(device.get_version()) > 12:
+            super(Chrome, self).__init__('com.android.chrome', 'com.google.android.apps.chrome.IntentDispatcher')
+        else:
+            super(Chrome, self).__init__('com.android.chrome', 'com.google.android.apps.chrome.Main')
 

AndroidRunner/Browsers/Firefox.py

@@ -2,6 +2,6 @@
 
 
 class Firefox(Browser):
-    def __init__(self):
+    def __init__(self, device=None):
         super(Firefox, self).__init__('org.mozilla.firefox', 'org.mozilla.gecko.BrowserApp')
 

AndroidRunner/Browsers/Opera.py

@@ -2,5 +2,5 @@
 
 
 class Opera(Browser):
-    def __init__(self):
+    def __init__(self, device=None):
         super(Opera, self).__init__('com.opera.browser', 'com.opera.Opera')

AndroidRunner/Device.py

@@ -197,6 +197,7 @@ def launch_activity(self, package, activity, action='', data_uri='', from_scratc
         # https://android.stackexchange.com/a/113919
         if from_scratch:
             cmd += ' --activity-clear-task'
+
         return Adb.shell(self.id, cmd)
 
     def force_stop(self, name):

AndroidRunner/Plugins/Profiler.py

@@ -46,7 +46,5 @@ def aggregate_end(self, data_dir, output_file):
         """
         raise NotImplementedError
 
-
-
 class ProfilerException(Exception):
-    pass
+    pass

AndroidRunner/WebExperiment.py

@@ -15,6 +15,11 @@ def __init__(self, config, progress, restart):
         self.browsers = [BrowserFactory.get_browser(b)() for b in config.get('browsers', ['chrome'])]
         Tests.check_dependencies(self.devices, [b.package_name for b in self.browsers])
         self.duration = Tests.is_integer(config.get('duration', 0)) / 1000
+    
+    # Browsers have version specific formatting, allows re-creation if needed
+    def regenerate_browsers(self, device):
+        # Regenerate browsers based on device version
+        self.browsers = [BrowserFactory.get_browser(b)(device) for b in self.config.get('browsers', ['chrome'])]
 
     def run(self, device, path, run, browser_name):
         browser = None
@@ -64,6 +69,10 @@ def before_run(self, device, path, run, *args, **kwargs):
         kwargs['browser'].start(device)
         time.sleep(5)
 
+    def before_experiment(self, device, *args, **kwargs):
+        super().before_experiment(self, device, *args, **kwargs)
+        self.regenerate_browsers(device)
+
     def interaction(self, device, path, run, *args, **kwargs):
         kwargs['browser'].load_url(device, path)
         time.sleep(5)

devices.json

@@ -14,5 +14,5 @@
   "GalaxyJ7-W": "192.168.0.106:5555",
 
   "Nexus 4": "emulator-5554",
-  "Pixel 6": "pixel_6",
+  "Pixel 6": "emulator-5554"
 }

examples/android/config.json

@@ -10,7 +10,7 @@
   "duration": 2000,
   "profilers": {
     "android": {
-      "subject_aggregation": "default",
+      "subject_aggregation": "none",
       "experiment_aggregation": "Scripts/aggregate_android.py",
       "sample_interval": 100,
       "data_points": [

examples/android/config_web.json

@@ -1,7 +1,7 @@
 {
   "type": "web",
   "devices": {
-    "nexus6p": {}
+    "Pixel 6": {}
   },
   "repetitions": 1,
   "browsers": [
@@ -12,7 +12,7 @@
   ],
   "profilers": {
     "android": {
-      "subject_aggregation": "default",
+      "subject_aggregation": "none",
       "experiment_aggregation": "Scripts/aggregate_android.py",
       "sample_interval": 100,
       "data_points": [

examples/android/config_web_root_charging_disabled.json

@@ -1,7 +1,7 @@
 {
   "type": "web",
   "devices": {
-    "nexus5x": {
+    "Pixel 6": {
       "root_disable_charging": "True",
       "charging_disabled_value": 0,
       "usb_charging_disabled_file": "sys/class/power_supply/battery/charging_enabled"
@@ -10,7 +10,7 @@
   "repetitions": 1,
   "randomization": false,
   "browsers": [
-    "firefox"
+    "chrome"
   ],
   "paths": [
     "https://google.com/",