Merge "Explicitly disable flag for some clipboard tests" into main (f1e0ccb0) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.systemui.clipboardoverlay;
		import static android.content.res.Configuration.ORIENTATION_PORTRAIT;

		import static com.android.systemui.Flags.FLAG_CLIPBOARD_SHARED_TRANSITIONS;
		import static com.android.systemui.Flags.FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_SHOWN;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISS_TAPPED;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_EXPANDED_FROM_MINIMIZED;
		@@ -166,6 +167,7 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {
		}

		@Test
		@DisableFlags(FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE)
		public void test_setClipData_invalidImageData_legacy() {
		initController();

		@@ -238,6 +240,7 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {
		}

		@Test
		@DisableFlags(FLAG_CLIPBOARD_USE_DESCRIPTION_MIMETYPE)
		public void test_setClipData_invalidImageData() {
		initController();