commit 25bffb40c5649704c5ef29da1ab33bb56cfa6574
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Apr 26 20:23:14 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 26 20:23:14 2024 +0000
tree ef4ef069fddc26c221a3fa9e355d8cc5d7629dc2
parent 32e66fcceb182ef5d13d98f67d1ba4fc27ce6e1f
parent 817b4f3a9d8bea8315332ce409221dcaaf93b474

Merge "Replace call to SetFlagsRule.initAllFlagsToReleaseConfigDefault() with constructor argument." into main

samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java

diff --git a/samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java b/samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java
index 635c347..bf16afc 100644
--- a/samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java
+++ b/samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java
@@ -29,7 +29,7 @@
 
 @RunWith(Parameterized.class)
 public final class StaticContentUnitTests {
-    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    @Rule public final SetFlagsRule mSetFlagsRule;
 
     @Parameterized.Parameters(name = "isInitWithDefault={0}")
     public static Object[] data() {
@@ -38,9 +38,9 @@
 
     public StaticContentUnitTests(boolean isInitWithDefault) {
         mIsInitWithDefault = isInitWithDefault;
-        if (isInitWithDefault) {
-            mSetFlagsRule.initAllFlagsToReleaseConfigDefault();
-        }
+        mSetFlagsRule = new SetFlagsRule(isInitWithDefault
+                ? SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT
+                : SetFlagsRule.DefaultInitValueType.NULL_DEFAULT);
     }
 
     private boolean mIsInitWithDefault;