Internal change

PiperOrigin-RevId: 739037474

Author: DeviceInfra

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

@@ -1209,11 +1209,11 @@ public TestResult getGtestResult(
       boolean isDeviceOnline = systemStateManager.isOnline(deviceId);
       if (!isDeviceOnline) {
         errorMsg.append(String.format("Device %s is not online", deviceId));
-        return TestResult.INFRA_ERROR;
+        return TestResult.ERROR;
       }
     } catch (MobileHarnessException e) {
       errorMsg.append(e.getMessage());
-      return TestResult.INFRA_ERROR;
+      return TestResult.ERROR;
     }
 
     // Get the test result from the testInfo and check if the individual test cases passed.

src/java/com/google/wireless/qa/mobileharness/shared/api/driver/AndroidInstrumentation.java

@@ -387,7 +387,6 @@ private void syncRun(
     String deviceId = getDevice().getDeviceId();
 
     boolean hasError = false;
-    boolean hasInfraError = false;
     boolean hasFail = false;
     boolean hasPass = false;
     MobileHarnessException errorResultCause = null;
@@ -561,14 +560,6 @@ private void syncRun(
                   "Instrumentation start/finish unexpectedly: " + errorMsg,
                   mhException);
           break;
-        case INFRA_ERROR:
-          hasInfraError = true;
-          infraErrorResultCause =
-              new MobileHarnessException(
-                  AndroidErrorId.ANDROID_INSTRUMENTATION_TEST_INFRA_ERROR,
-                  "Instrumentation start/finish unexpectedly: " + errorMsg,
-                  mhException);
-          break;
         case TIMEOUT:
           MobileHarnessException timeoutCause =
               new MobileHarnessException(
@@ -664,13 +655,7 @@ private void syncRun(
         logFilenames.toString());
 
     // Uses the worse case as the final result.
-    if (hasInfraError) {
-      testInfo
-          .resultWithCause()
-          .setNonPassing(
-              com.google.devtools.mobileharness.api.model.proto.Test.TestResult.ERROR,
-              infraErrorResultCause);
-    } else if (hasError) {
+    if (hasError) {
       testInfo
           .resultWithCause()
           .setNonPassing(