1 files changed, 4 insertions, 4 deletions
diff --git a/samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java b/samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java
index 635c347ed..bf16afc15 100644
--- a/samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java
+++ b/samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java
@@ -29,7 +29,7 @@ import org.junit.runners.Parameterized;
 
 @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 final class StaticContentUnitTests {
 
     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;