Internal change

PiperOrigin-RevId: 875500873

Author: DeviceInfra

src/java/com/google/devtools/mobileharness/platform/android/instrumentation/AndroidInstrumentationUtil.java

@@ -55,6 +55,7 @@
 import com.google.devtools.mobileharness.shared.util.file.local.LocalFileUtil;
 import com.google.devtools.mobileharness.shared.util.file.local.ResUtil;
 import com.google.devtools.mobileharness.shared.util.path.PathUtil;
+import com.google.devtools.mobileharness.shared.util.shell.ShellUtils;
 import com.google.devtools.mobileharness.shared.util.time.Sleeper;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.wireless.qa.mobileharness.shared.android.Aapt;
@@ -389,15 +390,15 @@ public String instrument(
     }
     if (!StrUtil.isEmptyOrWhitespace(className)) {
       command.append(" -e class ");
-      command.append(className);
+      command.append(ShellUtils.shellEscape(className));
     }
 
     if (otherOptions != null && !otherOptions.isEmpty()) {
       for (Entry<String, String> entry : otherOptions.entrySet()) {
         command.append(" -e ");
-        command.append(entry.getKey());
+        command.append(ShellUtils.shellEscape(entry.getKey()));
         command.append(' ');
-        command.append(entry.getValue());
+        command.append(ShellUtils.shellEscape(entry.getValue()));
       }
     }
 

src/java/com/google/devtools/mobileharness/platform/android/instrumentation/BUILD

@@ -56,6 +56,7 @@ java_library(
         "//src/java/com/google/devtools/mobileharness/shared/util/file/local:res_util",
         "//src/java/com/google/devtools/mobileharness/shared/util/logging:google_logger",
         "//src/java/com/google/devtools/mobileharness/shared/util/path",
+        "//src/java/com/google/devtools/mobileharness/shared/util/shell",
         "//src/java/com/google/devtools/mobileharness/shared/util/time:sleeper",
         "//src/java/com/google/wireless/qa/mobileharness/shared/android:aapt",
         "//src/java/com/google/wireless/qa/mobileharness/shared/api/device",