fix: Do not check if app is installed if we know it is

lib/tools/apk-utils.js

@@ -40,11 +40,16 @@ const RESOLVER_ACTIVITY_NAME = 'android/com.android.internal.app.ResolverActivit
 apkUtilsMethods.isAppInstalled = async function isAppInstalled (pkg) {
   log.debug(`Getting install status for ${pkg}`);
   let isInstalled;
-  try {
-    const stdout = await this.shell(['pm', 'path', pkg]);
-    isInstalled = /^package:/m.test(stdout);
-  } catch (ign) {
-    isInstalled = false;
+  if (await this.getApiLevel() < 26) {
+    try {
+      const stdout = await this.shell(['pm', 'path', pkg]);
+      isInstalled = /^package:/m.test(stdout);
+    } catch (ign) {
+      isInstalled = false;
+    }
+  } else {
+    const stdout = await this.shell(['cmd', 'package', 'list', 'packages']);
+    isInstalled = new RegExp(`^package:${_.escapeRegExp(pkg)}$`, 'm').test(stdout);
   }
   log.debug(`'${pkg}' is${!isInstalled ? ' not' : ''} installed`);
   return isInstalled;
@@ -390,6 +395,8 @@ apkUtilsMethods.waitForNotActivity = async function waitForNotActivity (pkg, act
  *                                      app is uninstalled.
  * @property {boolean} [keepData] - Set to true in order to keep the
  *                                        application data and cache folders after uninstall.
+ * @property {boolean} [skipInstallCheck] Whether to check if the app is installed prior to
+ * uninstalling it. By default this is checked.
  */
 
 /**
@@ -403,7 +410,7 @@ apkUtilsMethods.waitForNotActivity = async function waitForNotActivity (pkg, act
  */
 apkUtilsMethods.uninstallApk = async function uninstallApk (pkg, options = {}) {
   log.debug(`Uninstalling ${pkg}`);
-  if (!await this.isAppInstalled(pkg)) {
+  if (!options.skipInstallCheck && !await this.isAppInstalled(pkg)) {
     log.info(`${pkg} was not uninstalled, because it was not present on the device`);
     return false;
   }
@@ -796,7 +803,7 @@ apkUtilsMethods.installOrUpgrade = async function installOrUpgrade (appPath, pkg
   const appState = await this.getApplicationInstallState(appPath, pkg);
   let wasUninstalled = false;
   const uninstallPackage = async () => {
-    if (!await this.uninstallApk(/** @type {string} */ (pkg))) {
+    if (!await this.uninstallApk(/** @type {string} */ (pkg), {skipInstallCheck: true})) {
       throw new Error(`'${pkg}' package cannot be uninstalled`);
     }
     wasUninstalled = true;

test/unit/apk-utils-specs.js

@@ -47,20 +47,42 @@ describe('Apk-utils', withMocks({adb, fs, teen_process}, function (mocks) {
   });
 
   describe('isAppInstalled', function () {
-    it('should parse correctly and return true', async function () {
+    it('should parse correctly and return true for older versions', async function () {
       const pkg = 'dummy.package';
+      mocks.adb.expects('getApiLevel')
+        .returns(25);
       mocks.adb.expects('shell')
-        .twice().withExactArgs(['pm', 'path', pkg])
+        .once().withExactArgs(['pm', 'path', pkg])
         .returns(`package:/system/priv-app/TeleService/TeleService.apk`);
       (await adb.isAppInstalled(pkg)).should.be.true;
     });
-    it('should parse correctly and return false', async function () {
+    it('should parse correctly and return false for older versions', async function () {
       const pkg = 'dummy.package';
+      mocks.adb.expects('getApiLevel')
+        .returns(25);
       mocks.adb.expects('shell')
         .once().withExactArgs(['pm', 'path', pkg])
         .throws();
       (await adb.isAppInstalled(pkg)).should.be.false;
     });
+    it('should parse correctly and return true for newer versions', async function () {
+      const pkg = 'dummy.package';
+      mocks.adb.expects('getApiLevel')
+        .returns(26);
+      mocks.adb.expects('shell')
+        .once().withExactArgs(['cmd', 'package', 'list', 'packages'])
+        .returns(`package:dummy.package\npackage:other.package\n`);
+      (await adb.isAppInstalled(pkg)).should.be.true;
+    });
+    it('should parse correctly and return false for newer versions', async function () {
+      const pkg = 'dummy.package';
+      mocks.adb.expects('getApiLevel')
+        .returns(26);
+      mocks.adb.expects('shell')
+        .once().withExactArgs(['cmd', 'package', 'list', 'packages'])
+        .returns(`package:dummy.package1`);
+      (await adb.isAppInstalled(pkg)).should.be.false;
+    });
   });
 
   describe('getFocusedPackageAndActivity', function () {
@@ -824,7 +846,7 @@ describe('Apk-utils', withMocks({adb, fs, teen_process}, function (mocks) {
         isInstalled: true,
       });
       mocks.adb.expects('install').withArgs(apkPath, {replace: true}).once().throws();
-      mocks.adb.expects('uninstallApk').withExactArgs(pkgId).once().returns(true);
+      mocks.adb.expects('uninstallApk').withArgs(pkgId).once().returns(true);
       mocks.adb.expects('install').withArgs(apkPath, {replace: false}).once().returns(true);
       await adb.installOrUpgrade(apkPath);
     });
@@ -838,7 +860,7 @@ describe('Apk-utils', withMocks({adb, fs, teen_process}, function (mocks) {
         versionCode: 1,
         isInstalled: true,
       });
-      mocks.adb.expects('uninstallApk').withExactArgs(pkgId).once().returns(true);
+      mocks.adb.expects('uninstallApk').withArgs(pkgId).once().returns(true);
       mocks.adb.expects('install').withArgs(apkPath).twice().throws();
       await adb.installOrUpgrade(apkPath).should.be.rejected;
     });
@@ -852,7 +874,7 @@ describe('Apk-utils', withMocks({adb, fs, teen_process}, function (mocks) {
         versionCode: 1,
         isInstalled: true,
       });
-      mocks.adb.expects('uninstallApk').withExactArgs(pkgId).once().returns(false);
+      mocks.adb.expects('uninstallApk').withArgs(pkgId).once().returns(false);
       mocks.adb.expects('install').withArgs(apkPath).once().throws();
       await adb.installOrUpgrade(apkPath).should.be.rejected;
     });