Internal change

PiperOrigin-RevId: 875635253

Author: DeviceInfra

src/java/com/google/devtools/mobileharness/platform/android/packagemanager/AndroidPackageManagerUtil.java

@@ -82,16 +82,6 @@ public class AndroidPackageManagerUtil {
   /** ADB arg of uninstalation. Should be followed with a package name. */
   @VisibleForTesting static final String ADB_ARG_UNINSTALL = "uninstall";
 
-  /** ADB args for installing a APK. Should be followed by the path of the APK. */
-  @VisibleForTesting static final String[] ADB_ARGS_INSTALL = new String[] {"install", "-r", "-t"};
-
-  /**
-   * ADB args for installing an app with multiple files (APK or Dex Metadata files). Should be
-   * followed by the space-delimited paths of multiple files.
-   */
-  @VisibleForTesting
-  static final String[] ADB_ARGS_INSTALL_MULTIPLE = new String[] {"install-multiple", "-r"};
-
   /**
    * split_1.apk:split_2.apk:...:split_n.apk. All apks in each item are the split apks belong to a
    * single package.
@@ -103,8 +93,7 @@ public class AndroidPackageManagerUtil {
 
   /** ADB shell command for installing a package. */
   @VisibleForTesting
-  static final ImmutableList<String> ADB_SHELL_INSTALL_PACKAGE =
-      ImmutableList.of("pm", "install", "-r", "-t");
+  static final ImmutableList<String> ADB_SHELL_INSTALL_PACKAGE = ImmutableList.of("pm", "install");
 
   /** ADB shell command for uninstalling a package. Should be followed by the package name. */
   @VisibleForTesting static final String ADB_SHELL_UNINSTALL_PACKAGE = "pm uninstall";
@@ -1019,14 +1008,18 @@ public void installRemoteApk(
       throws MobileHarnessException, InterruptedException {
     installApk(
         utilArgs,
+        InstallCmdArgs.builder()
+            .setReplaceExistingApp(true)
+            .setAllowTestPackages(true)
+            .setAllowVersionCodeDowngrade(true)
+            .setGrantPermissions(grantPermissions)
+            .addExtraArgs(extraArgs)
+            .build(),
         packageName,
         apkPath,
         null,
-        grantPermissions,
-        /* forceNoStreaming= */ false,
         /* isRemoteInstall= */ true,
-        installTimeout,
-        extraArgs);
+        installTimeout);
   }
 
   /**
@@ -1112,52 +1105,41 @@ public void installApk(
 
     installApk(
         utilArgs,
+        InstallCmdArgs.builder()
+            .setReplaceExistingApp(true)
+            .setAllowTestPackages(true)
+            .setAllowVersionCodeDowngrade(true)
+            .setGrantPermissions(grantPermissions)
+            .setForceNoStreaming(forceNoStreaming)
+            .addExtraArgs(extraArgs)
+            .build(),
         packageName,
         apkPath,
         dexMetadataPath,
-        grantPermissions,
-        forceNoStreaming,
         /* isRemoteInstall= */ false,
-        installTimeout,
-        extraArgs);
+        installTimeout);
   }
 
   private void installApk(
       UtilArgs utilArgs,
+      InstallCmdArgs installCmdArgs,
       String packageName,
       String apkPath,
       @Nullable String dexMetadataPath,
-      boolean grantPermissions,
-      boolean forceNoStreaming,
       boolean isRemoteInstall,
-      @Nullable Duration installTimeout,
-      String... extraArgs)
+      @Nullable Duration installTimeout)
       throws MobileHarnessException, InterruptedException {
-    // Installs the apk.
-    // "-d" only works with 17+ devices to allow app downgrade.
-    // "-g" only works with 23+ devices to grant all required permissions.
     String serial = utilArgs.serial();
     int sdkVersion = utilArgs.sdkVersion().orElse(0);
     String[] installFiles =
         dexMetadataPath != null ? new String[] {apkPath, dexMetadataPath} : new String[] {apkPath};
     String[] installCommand =
         isRemoteInstall
             ? ADB_SHELL_INSTALL_PACKAGE.toArray(new String[0])
-            : installFiles.length > 1 ? ADB_ARGS_INSTALL_MULTIPLE : ADB_ARGS_INSTALL;
-    if (sdkVersion >= 17) {
-      installCommand = ArrayUtil.join(installCommand, "-d");
-    }
-    if (sdkVersion >= 23 && grantPermissions) {
-      installCommand = ArrayUtil.join(installCommand, "-g");
-    }
-
-    if (sdkVersion >= 27 && forceNoStreaming) {
-      installCommand = ArrayUtil.join(installCommand, "--no-streaming");
-    }
-
-    if (extraArgs.length > 0) {
-      installCommand = ArrayUtil.join(installCommand, extraArgs);
-    }
+            : installFiles.length > 1
+                ? new String[] {"install-multiple"}
+                : new String[] {"install"};
+    installCommand = ArrayUtil.join(installCommand, installCmdArgs.getInstallArgsArray(sdkVersion));
 
     if (utilArgs.userId().isPresent()) {
       installCommand = ArrayUtil.join(installCommand, "--user", utilArgs.userId().get());

src/java/com/google/devtools/mobileharness/platform/android/packagemanager/InstallCmdArgs.java

@@ -17,11 +17,8 @@
 package com.google.devtools.mobileharness.platform.android.packagemanager;
 
 import com.google.auto.value.AutoValue;
-import com.google.auto.value.extension.memoized.Memoized;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Common args for adb app installation: install, install-multiple, install-multi-package. Only used
@@ -68,29 +65,38 @@ public abstract class InstallCmdArgs {
 
   abstract Builder toBuilder();
 
-  @Memoized
+  /** Gets the install args array. */
   public String[] getInstallArgsArray() {
-    List<String> argList = new ArrayList<>();
+    return getInstallArgsArray(Integer.MAX_VALUE);
+  }
+
+  /**
+   * Gets the install args array for the given sdk version.
+   *
+   * @param sdkVersion the sdk version of the device, used to determine if the arg is supported.
+   */
+  public String[] getInstallArgsArray(int sdkVersion) {
+    ImmutableList.Builder<String> args = ImmutableList.builder();
     if (replaceExistingApp()) {
-      argList.add(ARG_REPLACE_EXISTING_APP);
+      args.add(ARG_REPLACE_EXISTING_APP);
     }
     if (allowTestPackages()) {
-      argList.add(ARG_ALLOW_TEST_PACKAGES);
+      args.add(ARG_ALLOW_TEST_PACKAGES);
     }
-    if (allowVersionCodeDowngrade()) {
-      argList.add(ARG_ALLOW_VERSION_CODE_DOWNGRADE);
+    if (allowVersionCodeDowngrade() && sdkVersion >= 17) {
+      args.add(ARG_ALLOW_VERSION_CODE_DOWNGRADE);
     }
-    if (grantPermissions()) {
-      argList.add(ARG_GRANT_PERMISSIONS);
+    if (grantPermissions() && sdkVersion >= 23) {
+      args.add(ARG_GRANT_PERMISSIONS);
     }
-    if (instant()) {
-      argList.add(ARG_INSTANT);
+    if (instant() && sdkVersion >= 26) {
+      args.add(ARG_INSTANT);
     }
-    if (forceNoStreaming()) {
-      argList.add(ARG_FORCE_NO_STREAMING);
+    if (forceNoStreaming() && sdkVersion >= 27) {
+      args.add(ARG_FORCE_NO_STREAMING);
     }
-    argList.addAll(extraArgs());
-    return argList.toArray(new String[0]);
+    args.addAll(extraArgs());
+    return args.build().toArray(new String[0]);
   }
 
   /** Gets default InstallArgs builder instance. */