diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-26 20:23:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-26 20:23:14 +0000 |
| commit | 25bffb40c5649704c5ef29da1ab33bb56cfa6574 (patch) | |
| tree | ef4ef069fddc26c221a3fa9e355d8cc5d7629dc2 | |
| parent | 32e66fcceb182ef5d13d98f67d1ba4fc27ce6e1f (diff) | |
| parent | 817b4f3a9d8bea8315332ce409221dcaaf93b474 (diff) | |
| download | development-25bffb40c5649704c5ef29da1ab33bb56cfa6574.tar.gz | |
Merge "Replace call to SetFlagsRule.initAllFlagsToReleaseConfigDefault() with constructor argument." into main
| -rw-r--r-- | samples/AconfigDemo/tests/unittests/StaticContentUnitTests.java | 8 |
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; |