fix: require API 27 for extended lock management (#906)

* fix: require API 27 for extended lock management

* fix: preserve failed locksettings probe behavior

* refactor: detect lock management support by API level

Author: KazuCocoa

lib/tools/lockmgmt.ts

@@ -19,12 +19,7 @@ const HIDE_KEYBOARD_WAIT_TIME = 100;
  */
 export async function isLockManagementSupported(this: ADB): Promise<boolean> {
   if (typeof this._isLockManagementSupported !== 'boolean') {
-    const passFlag = '__PASS__';
-    let output = '';
-    try {
-      output = await this.shell([`locksettings help && echo ${passFlag}`]);
-    } catch {}
-    this._isLockManagementSupported = output.includes(passFlag);
+    this._isLockManagementSupported = (await this.getApiLevel()) >= 27;
     log.debug(`Extended lock settings management is ${this._isLockManagementSupported ? '' : 'not '}supported`);
   }
   return this._isLockManagementSupported as boolean;

test/unit/lockmgmt.spec.ts

@@ -20,6 +20,30 @@ describe('lock management', function () {
     sandbox.restore();
   });
 
+  describe('isLockManagementSupported', function () {
+    for (const apiLevel of [26, 27, 36]) {
+      it(`checks and caches support using only the API level (API ${apiLevel})`, async function () {
+        const adb = new ADB();
+        const getApiLevel = sandbox.stub(adb, 'getApiLevel').resolves(apiLevel);
+        const shell = sandbox.stub(adb, 'shell');
+        assert.strictEqual(await adb.isLockManagementSupported(), apiLevel >= 27);
+        assert.strictEqual(await adb.isLockManagementSupported(), apiLevel >= 27);
+        sinon.assert.calledOnce(getApiLevel);
+        sinon.assert.notCalled(shell);
+      });
+    }
+
+    it('does not cache a failed API lookup', async function () {
+      const adb = new ADB();
+      const getApiLevel = sandbox.stub(adb, 'getApiLevel');
+      getApiLevel.onFirstCall().rejects(new Error('device unavailable'));
+      getApiLevel.onSecondCall().resolves(27);
+      await assert.rejects(adb.isLockManagementSupported(), /device unavailable/);
+      assert.strictEqual(await adb.isLockManagementSupported(), true);
+      sinon.assert.calledTwice(getApiLevel);
+    });
+  });
+
   describe('credential arguments', {skip: process.platform === 'win32'}, function () {
     const credentials = ['1234', "pass'word", 'two words', 'a"b', '$APPIUM_QUOTE_TEST', 'a;b', 'a\nb', '*'];