Merge "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()" into main am: 46af250858

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/3058942

Change-Id: I2f3ea7f5283c30b49d70e9380ebd819e88790112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-04-29 16:13:12 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 8 deletions

View File

@@ -54,7 +54,7 @@ class LoaderTaskTest {
@get:Rule(order = 0) val staticMockitoRule = StaticMockitoRule(UserCache::class.java)
@get:Rule(order = 1)
val setFlagsRule = SetFlagsRule().apply { initAllFlagsToReleaseConfigDefault() }
val setFlagsRule = SetFlagsRule()
@Before
fun setup() {

View File

@@ -69,13 +69,7 @@ public class ActivityAllAppsContainerViewTest {
private WorkProfileManager mWorkManager;
private Context mContext;
@Rule public final SetFlagsRule mSetFlagsRule = getFlagsRule();
private SetFlagsRule getFlagsRule() {
SetFlagsRule flagsRule = new SetFlagsRule();
flagsRule.initAllFlagsToReleaseConfigDefault();
return flagsRule;
}
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before
public void setUp() {