From 817b4f3a9d8bea8315332ce409221dcaaf93b474 Mon Sep 17 00:00:00 2001
From: Jeff DeCew <jeffdq@google.com>
Date: Wed, 24 Apr 2024 16:57:33 +0000
Subject: Replace call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()
 with constructor argument.

Test: atest
Bug: 336802415
Flag: test_only
Merged-In: I55463b5e33021899e08d44e6318f0d5675c59dd5
Change-Id: I55463b5e33021899e08d44e6318f0d5675c59dd5
---
 samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java | 8 ++++----
 1 file 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;
-- 
cgit v1.2.3