feat: add disableSuppressAccessibilityService (#376)

* add disableSuppressAccessibilityService * make this.disableSuppressAccessibilityService optional * tune * tune * use isBoolean * switch to array * bump server version * bump the server version
appium · Mar 30, 2020 · c41986b · c41986b
1 parent d6cadbb
commit c41986b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/lib/desired-caps.js b/lib/desired-caps.js
@@ -43,6 +43,9 @@ let uiautomatorCapConstraints = {
   },
   appWaitForLaunch: {
     isBoolean: true
+  },
+  disableSuppressAccessibilityService: {
+    isBoolean: true
   }
 };
 

diff --git a/lib/driver.js b/lib/driver.js
@@ -431,6 +431,7 @@ class AndroidUiautomator2Driver extends BaseDriver {
       appPackage: this.opts.appPackage,
       appActivity: this.opts.appActivity,
       disableWindowAnimation: !!this.opts.disableWindowAnimation,
+      disableSuppressAccessibilityService: this.opts.disableSuppressAccessibilityService,
     });
     this.proxyReqRes = this.uiautomator2.proxyReqRes.bind(this.uiautomator2);
 

diff --git a/lib/uiautomator2.js b/lib/uiautomator2.js
@@ -26,6 +26,7 @@ class UiAutomator2Server {
       }
       this[req] = opts[req];
     }
+    this.disableSuppressAccessibilityService = opts.disableSuppressAccessibilityService;
     this.jwproxy = new JWProxy({
       server: this.host,
       port: this.systemPort,
@@ -252,6 +253,9 @@ class UiAutomator2Server {
     if (this.disableWindowAnimation) {
       cmd.push('--no-window-animation');
     }
+    if (_.isBoolean(this.disableSuppressAccessibilityService)) {
+      cmd.push('-e', 'DISABLE_SUPPRESS_ACCESSIBILITY_SERVICES', this.disableSuppressAccessibilityService);
+    }
     cmd.push(INSTRUMENTATION_TARGET);
     const instrumentationProcess = this.adb.createSubProcess(['shell', ...cmd]);
     instrumentationProcess.on('output', (stdout, stderr) => {

diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "appium-android-driver": "^4.27.0",
     "appium-base-driver": "^5.0.0",
     "appium-support": "^2.37.0",
-    "appium-uiautomator2-server": "^4.5.7",
+    "appium-uiautomator2-server": "^4.6.1",
     "async-lock": "^1.2.2",
     "asyncbox": "^2.3.1",
     "bluebird": "^3.5.1",

diff --git a/test/unit/driver-specs.js b/test/unit/driver-specs.js
@@ -229,7 +229,13 @@ describe('driver.js', function () {
       sandbox.stub(driver, 'addDeviceInfoToCaps');
 
       driver.uiautomator2 = new UiAutomator2Server({
-        adb: ADB.createADB(), tmpDir: 'tmp', systemPort: 4724, host: 'localhost', devicePort: 6790, disableWindowAnimation: false
+        adb: ADB.createADB(),
+        tmpDir: 'tmp',
+        systemPort: 4724,
+        host: 'localhost',
+        devicePort: 6790,
+        disableWindowAnimation: false,
+        disableSuppressAccessibilityService: false,
       });
       sandbox.stub(driver.uiautomator2, 'startSession');
     });

diff --git a/test/unit/uiautomator2-specs.js b/test/unit/uiautomator2-specs.js
@@ -15,8 +15,13 @@ describe('UiAutomator2', function () {
     let uiautomator2;
     beforeEach(function () {
       uiautomator2 = new UiAutomator2Server({
-        adb, tmpDir: 'tmp', systemPort: 4724,
-        host: 'localhost', devicePort: 6790, disableWindowAnimation: false
+        adb,
+        tmpDir: 'tmp',
+        systemPort: 4724,
+        host: 'localhost',
+        devicePort: 6790,
+        disableWindowAnimation: false,
+        disableSuppressAccessibilityService: false
       });
     });
     afterEach(function () {