From 5a093d8224a2e0707a713f62aa009a97d7614913 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Wed, 24 Apr 2024 16:56:58 +0000 Subject: [PATCH] Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault() Test: atest Bug: 336802415 Flag: test_only Merged-In: Ic3e189983b30ef60c5be61aaeefb1641a5651bf9 Change-Id: Ic3e189983b30ef60c5be61aaeefb1641a5651bf9 --- tests/src/com/android/launcher3/model/LoaderTaskTest.kt | 2 +- .../launcher3/ui/ActivityAllAppsContainerViewTest.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt index def27b8897..5ea104d414 100644 --- a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt +++ b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt @@ -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() { diff --git a/tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java b/tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java index 3411fc11db..e49f2b18a6 100644 --- a/tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java +++ b/tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java @@ -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() {