Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6370fd16 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Clean up ClipboardOverlayController after tests" into tm-qpr-dev am:...

Merge "Clean up ClipboardOverlayController after tests" into tm-qpr-dev am: 584274c3 am: 74cd6be6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20245923



Change-Id: I45f11bf8364036dae04584fc1d5be230d0d3d22b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8afc936a 74cd6be6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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();
+6 −2
Original line number Diff line number Diff line
@@ -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;