diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java index bfb27a4c87b8e..9f338d1c6e1d8 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java @@ -459,7 +459,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv anim.start(); } - private void hideImmediate() { + void hideImmediate() { // Note this may be called multiple times if multiple dismissal events happen at the same // time. mTimeoutHandler.cancelTimeout(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java index 677c7bdcffe17..b7f1c1a9f001e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java @@ -39,8 +39,8 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.screenshot.TimeoutHandler; +import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -48,7 +48,6 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -@Ignore("b/254635291") @SmallTest @RunWith(AndroidJUnit4.class) public class ClipboardOverlayControllerTest extends SysuiTestCase { @@ -97,6 +96,11 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { mCallbacks = mOverlayCallbacksCaptor.getValue(); } + @After + public void tearDown() { + mOverlayController.hideImmediate(); + } + @Test public void test_setClipData_nullData() { ClipData clipData = null;