Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Miranda Kephart
2022-10-24 15:58:03 +00:00
committed by Android (Google) Code Review
parent 7cacb22ac4 345faf8015
commit 584274c3a7
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
View File

@@ -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();

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

@@ -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;