Snap for 11192287 from d96db3623843815f8a29c605b8de3ea373aa1c7a to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I6980e73c09c8e5f0fdecf2977803d8c18d32b3b9

1 files changed, 1 insertions, 9 deletions

diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java
index 9c15d35b..27120808 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java
@@ -21,12 +21,10 @@ import com.android.compatibility.common.tradefed.testtype.SubPlan;
 import com.android.compatibility.common.tradefed.testtype.retry.RetryFactoryTest;
 import com.android.ddmlib.Log.LogLevel;
 import com.android.tradefed.build.IBuildInfo;
-import com.android.tradefed.config.ConfigurationException;
 import com.android.tradefed.config.IConfiguration;
 import com.android.tradefed.config.Option;
 import com.android.tradefed.config.Option.Importance;
 import com.android.tradefed.config.OptionClass;
-import com.android.tradefed.config.OptionSetter;
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.suite.BaseTestSuite;
@@ -68,13 +66,7 @@ public final class CompatibilityTestSuite extends BaseTestSuite {
      * Ctor that sets some default for Compatibility runs.
      */
     public CompatibilityTestSuite() {
-        try {
-            OptionSetter setter = new OptionSetter(this);
-            setter.setOptionValue("skip-loading-config-jar", "true");
-        } catch (ConfigurationException e) {
-            // Should not happen
-            throw new RuntimeException(e);
-        }
+        setSkipjarLoading(true);
     }
 
     @Override