Merge pull request #109 from mhkarsten/update_androidrunner

Update android-runner & fix some bugs

Author: Raiduy

.coveragerc

@@ -6,6 +6,7 @@ omit = */old tests*
 	*/tests/*
 	*BatterystatsParser*
 	*/python3.6/*
+	*/python3.13/*
 	*/pytest-*
 	*/.venv/*
 

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-  - "3.6"
+  - "3.13"
 before_script:
 install:
   - pip install pytest

AndroidRunner/Browsers/Browser.py

@@ -11,8 +11,17 @@ def __init__(self, package_name, main_activity):
 
     def start(self, device):
         self.logger.info('%s: Start' % device.id)
-        device.launch_activity(self.package_name, self.main_activity, from_scratch=True, force_stop=True,
-                               action='android.intent.action.VIEW')
+        
+        kwargs = {
+            'from_scratch': True, 
+            'force_stop':   True,
+            'action':       'android.intent.action.VIEW',
+        }
+
+        if device != None and int(device.get_version()) > 12:
+            kwargs['data_uri'] = "about:blank"
+
+        device.launch_activity(self.package_name, self.main_activity, **kwargs)
 
     def load_url(self, device, url):
         self.logger.info('%s: Load URL: %s' % (device.id, url))

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

@@ -164,10 +164,11 @@ def plug(self):
 
     def current_activity(self):
         """Newer Android 10 does not have mCurrentFocus and mFocusedApp. Different approach to get the current activity"""
-        recent_activity = Adb.shell(self.id,'dumpsys activity recents | grep "Recent #0" | cut -d "=" -f2 | grep -o -p "[a-z|.]*"')
-
+        recent_activity = Adb.shell(self.id,'dumpsys activity recents | grep "Recent #0" | tr " }" "\n" | grep "=" | cut -d "=" -f 2 | sed -E "s/[^a-zA-Z.]+//g"')
+        
+        """Recent activities have both a type (home/standard/ect.) as well as a name e.g. com.android.chrome"""
         if recent_activity:
-            result = recent_activity
+            result = {"type": recent_activity.split("\n")[0], "name": recent_activity.split("\n")[1]}
             self.logger.debug('Current activity: %s' % result)
             return result
         else:
@@ -197,6 +198,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/Devices.py

@@ -12,7 +12,7 @@ class Devices:
     def __init__(self, devices, adb_path='adb', devices_spec=None):
         if devices_spec is None:
             devices_spec = op.join(ROOT_DIR, 'devices.json')
-            
+        
         Adb.setup(adb_path)
         mapping_file = load_json(devices_spec)
         self._device_map = {n: mapping_file.get(n, None) for n in devices}

AndroidRunner/Experiment.py

@@ -22,32 +22,33 @@ def __init__(self, config, progress, restart):
         self.progress = progress
         self.basedir = None
         self.random = config.get('randomization', False)
+        
         Tests.is_valid_option(self.random, valid_options=[True, False])
         self.clear_cache = config.get('clear_cache', False)
         Tests.is_valid_option(self.clear_cache, valid_options=[True, False])
+        
         if 'devices' not in config:
             raise ConfigError('"device" is required in the configuration')
         adb_path = config.get('adb_path', 'adb')
+        
         self.devices = Devices(config['devices'], adb_path=adb_path, devices_spec=config.get('devices_spec'))
         self.repetitions = Tests.is_integer(config.get('repetitions', 1))
         self.paths = config.get('paths', [])
         self.profilers = Profilers(config.get('profilers', {}))
-        monkeyrunner_path = config.get('monkeyrunner_path', 'monkeyrunner')
-        monkey_playback_path = config.get('monkey_playback_path', 'monkey_playback.py')
-        self.scripts = Scripts(config.get('scripts', {}), monkeyrunner_path=monkeyrunner_path, monkey_playback_path=monkey_playback_path)
+        self.scripts = Scripts(config.get('scripts', {}))
         self.reset_adb_among_runs = config.get('reset_adb_among_runs', False)
         Tests.is_valid_option(self.reset_adb_among_runs, valid_options=[True, False])
         self.time_between_run = Tests.is_integer(config.get('time_between_run', 0))
         Tests.check_dependencies(self.devices, self.profilers.dependencies())
         self.output_root = paths.OUTPUT_DIR
         self.result_file_structure = None
-        
+
         self.usb_handler_config = config.get("usb_handler", None)
         self.usb_handler = USBHandler(self.usb_handler_config)
 
         self.run_stopping_condition_config = config.get("run_stopping_condition", None)
         self.queue = mp.Queue()
-        
+
         if restart:
             for device in self.devices:
                 self.prepare_device(device, restart=True)