| commit | 4405ac0333a41d6fdf2dc673f95de7291676a7d8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Apr 29 16:13:12 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 29 16:13:12 2024 +0000 |
| tree | 2345511b2dd0aa39d14842b7f571b60ec2e1b1f6 | |
| parent | f18ee90f038fa51c230ead48825e99a2ee610c05 [diff] | |
| parent | 46af250858215fc3509a9fac36111b8dfd8d4f82 [diff] |
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>
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() {
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() {