diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-30 23:29:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-30 23:29:06 +0000 |
| commit | 379bbeab9d32b2d5aedc9fd80cfbf7d90766e16a (patch) | |
| tree | 2345511b2dd0aa39d14842b7f571b60ec2e1b1f6 | |
| parent | 63972653eb5328e14b3d205a1832d8d4eeb05c70 (diff) | |
| parent | a026c2f768be63326eb2f885e672709bf66512fe (diff) | |
| download | Launcher3-sdk-release.tar.gz | |
Merge "Snap for 11785460 from 46af250858215fc3509a9fac36111b8dfd8d4f82 to sdk-release" into sdk-releasesdk-release
| -rw-r--r-- | tests/src/com/android/launcher3/model/LoaderTaskTest.kt | 2 | ||||
| -rw-r--r-- | tests/src/com/android/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() { |