commit 8b18b6e8b2fd2fbd9406dd82004398ce108f8157
author Julien Desprez <jdesprez@google.com> Thu Jul 07 12:37:17 2022 -0700
committer Julien Desprez <jdesprez@google.com> Thu Jul 07 21:55:46 2022 +0000
tree ef03059084976f79692368fc1721b8d15ab15f9a
parent 9ab0b93220844385eb301e1fb9802a881a21bd2f

Unset delegation variable for unit tests subprocess

Test: presubmit
Bug: None
Change-Id: I99170b1889e120da9a7f569bc5405b073e9ac0a3

src/com/android/tradefed/testtype/SubprocessTfLauncher.java

diff --git a/src/com/android/tradefed/testtype/SubprocessTfLauncher.java b/src/com/android/tradefed/testtype/SubprocessTfLauncher.java
index 67a506a..5f1c571 100644
--- a/src/com/android/tradefed/testtype/SubprocessTfLauncher.java
+++ b/src/com/android/tradefed/testtype/SubprocessTfLauncher.java
@@ -25,6 +25,7 @@
 import com.android.tradefed.config.proxy.AutomatedReporters;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.error.HarnessRuntimeException;
+import com.android.tradefed.invoker.DelegatedInvocationExecution;
 import com.android.tradefed.invoker.IInvocationContext;
 import com.android.tradefed.invoker.RemoteInvocationExecution;
 import com.android.tradefed.invoker.TestInformation;
@@ -276,6 +277,7 @@
         mRunUtil.unsetEnvVariable(GlobalConfiguration.GLOBAL_CONFIG_SERVER_CONFIG_VARIABLE);
         mRunUtil.unsetEnvVariable(ANDROID_SERIAL_VAR);
         mRunUtil.unsetEnvVariable(RemoteInvocationExecution.START_FEATURE_SERVER);
+        mRunUtil.unsetEnvVariable(DelegatedInvocationExecution.DELEGATED_MODE_VAR);
         for (String variable : AutomatedReporters.REPORTER_MAPPING) {
             mRunUtil.unsetEnvVariable(variable);
         }