commit 409d0082395d3a4012383c0969894e6be1c07f81
author Julien Desprez <jdesprez@google.com> Mon Apr 24 09:49:18 2023 -0700
committer Julien Desprez <jdesprez@google.com> Tue Apr 25 21:41:45 2023 +0000
tree b1c9f653c90672e449145ff1a10b76f29bc3985b
parent e736b37a8211b97f3c07c876efecd7b287ab2a34

Inject options to the specified object directly

Avoid collision on option with same name.

Test: presubmit
Bug: 267413275
Change-Id: Ic4000e5bb39e888770cbff70ad82fe659bdc3cc3

src/com/android/tradefed/testtype/suite/SuiteModuleLoader.java

diff --git a/src/com/android/tradefed/testtype/suite/SuiteModuleLoader.java b/src/com/android/tradefed/testtype/suite/SuiteModuleLoader.java
index b5d57b0..e3b5045 100644
--- a/src/com/android/tradefed/testtype/suite/SuiteModuleLoader.java
+++ b/src/com/android/tradefed/testtype/suite/SuiteModuleLoader.java
@@ -24,6 +24,7 @@
 import com.android.tradefed.config.IConfigurationFactory;
 import com.android.tradefed.config.IDeviceConfiguration;
 import com.android.tradefed.config.OptionDef;
+import com.android.tradefed.config.OptionSetter;
 import com.android.tradefed.device.DeviceFoldableState;
 import com.android.tradefed.error.HarnessRuntimeException;
 import com.android.tradefed.invoker.IInvocationContext;
@@ -909,7 +910,10 @@
             for (ITargetPreparer preparer : holder.getTargetPreparers()) {
                 String className = preparer.getClass().getName();
                 if (mTestOrPreparerOptions.containsKey(className)) {
-                    config.injectOptionValues(mTestOrPreparerOptions.get(className));
+                    OptionSetter preparerSetter = new OptionSetter(preparer);
+                    for (OptionDef def : mTestOrPreparerOptions.get(className)) {
+                        preparerSetter.setOptionValue(def.name, def.key, def.value);
+                    }
                 }
                 if (preparer instanceof IAbiReceiver) {
                     ((IAbiReceiver) preparer).setAbi(abi);
@@ -922,7 +926,10 @@
         for (IRemoteTest test : tests) {
             String className = test.getClass().getName();
             if (mTestOrPreparerOptions.containsKey(className)) {
-                config.injectOptionValues(mTestOrPreparerOptions.get(className));
+                OptionSetter preparerSetter = new OptionSetter(test);
+                for (OptionDef def : mTestOrPreparerOptions.get(className)) {
+                    preparerSetter.setOptionValue(def.name, def.key, def.value);
+                }
             }
             addFiltersToTest(test, abi, fullId, mIncludeFilters, mExcludeFilters);
             if (test instanceof IAbiReceiver) {