From 6ee3a32b1296c8dddbfdcf200804c415760524d7 Mon Sep 17 00:00:00 2001 From: Anushree Ganjam Date: Mon, 16 Oct 2023 13:29:30 -0700 Subject: [PATCH] [Trunk Stable] Use SetFlagsRule.initAllFlagsToReleaseConfigDefault instead of disabling all flags in setUp. Bug: 294913042 Flag: NA Test: Unit tests Change-Id: Ib570ce67f53d4af7407b36f6fee1a3517800155f --- .../tests/src/com/android/quickstep/RecentsModelTest.java | 5 ----- tests/src/com/android/launcher3/ui/BubbleTextViewTest.java | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/RecentsModelTest.java b/quickstep/tests/src/com/android/quickstep/RecentsModelTest.java index c552d83400..648fa932a6 100644 --- a/quickstep/tests/src/com/android/quickstep/RecentsModelTest.java +++ b/quickstep/tests/src/com/android/quickstep/RecentsModelTest.java @@ -101,11 +101,6 @@ public class RecentsModelTest { when(mContext.getResources()).thenReturn(mResource); } - @After - public void tearDown() throws Exception { - mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW); - } - @Test @UiThreadTest public void preloadOnHighResolutionEnabled() { diff --git a/tests/src/com/android/launcher3/ui/BubbleTextViewTest.java b/tests/src/com/android/launcher3/ui/BubbleTextViewTest.java index 6c2950cb6a..b01941456a 100644 --- a/tests/src/com/android/launcher3/ui/BubbleTextViewTest.java +++ b/tests/src/com/android/launcher3/ui/BubbleTextViewTest.java @@ -97,9 +97,7 @@ public class BubbleTextViewTest { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_TWOLINE_ALLAPPS); - mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_CURSOR_HOVER_STATES); - mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU); + mSetFlagsRule.initAllFlagsToReleaseConfigDefault(); Utilities.enableRunningInTestHarnessForTests(); mContext = new ActivityContextWrapper(getApplicationContext()); mBubbleTextView = new BubbleTextView(mContext);