commit 46af250858215fc3509a9fac36111b8dfd8d4f82
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Apr 29 15:50:41 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 29 15:50:41 2024 +0000
tree 2345511b2dd0aa39d14842b7f571b60ec2e1b1f6
parent 2eadab3702141bb1f04ad10cf3c879ab3e80eff8
parent 5a093d8224a2e0707a713f62aa009a97d7614913

Merge "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()" into main

tests/src/com/android/launcher3/model/LoaderTaskTest.kt

diff --git a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt
index def27b8..5ea104d 100644
--- a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt
+++ b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt
@@ -54,7 +54,7 @@
 
     @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() {

tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java

diff --git a/tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java b/tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java
index 3411fc1..e49f2b1 100644
--- a/tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java
+++ b/tests/src/com/android/launcher3/ui/ActivityAllAppsContainerViewTest.java
@@ -69,13 +69,7 @@
     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() {