Merge pull request #392 from marcbonnici/uiauto2

Upgrading to UiAutomator2

wlauto/utils/android.py

@@ -103,6 +103,24 @@ ANDROID_NORMAL_PERMISSIONS = [
     'UNINSTALL_SHORTCUT',
 ]
 
+ANDROID_UNCHANGEABLE_PERMISSIONS = [
+    'USE_CREDENTIALS',
+    'MANAGE_ACCOUNTS',
+    'DOWNLOAD_WITHOUT_NOTIFICATION',
+    'AUTHENTICATE_ACCOUNTS',
+    'WRITE_SETTINGS',
+    'WRITE_SYNC_STATS',
+    'SUBSCRIBED_FEEDS_WRITE',
+    'SUBSCRIBED_FEEDS_READ',
+    'READ_PROFILE',
+    'WRITE_MEDIA_STORAGE',
+    'RESTART_PACKAGES',
+    'MOUNT_UNMOUNT_FILESYSTEMS',
+    'CLEAR_APP_CACHE',
+    'GET_TASKS',
+]
+
+
 # Package versions that are known to have problems with AndroidUiAutoBenchmark workloads.
 # NOTE: ABI versions are not included.
 UNSUPPORTED_PACKAGES = {

wlauto/utils/power.py

@@ -342,7 +342,7 @@ def record_state_transitions(reporter, stream):
 
 class PowerStateTransitions(object):
 
-    def __init__(self, filepath ):
+    def __init__(self, filepath):
         self.filepath = filepath
         self._wfh = open(filepath, 'w')
         self.writer = csv.writer(self._wfh)