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 am: 584274c3a7

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

Change-Id: I1d8a45e8e529a2b674093125493b7224bed13073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miranda Kephart
2022-10-24 17:20:41 +00:00
committed by Automerger Merge Worker
parent 83e5e36543 584274c3a7
commit 74cd6be6e8
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(); anim.start();
} }
private void hideImmediate() { void hideImmediate() {
// Note this may be called multiple times if multiple dismissal events happen at the same // Note this may be called multiple times if multiple dismissal events happen at the same
// time. // time.
mTimeoutHandler.cancelTimeout(); 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.broadcast.BroadcastSender;
import com.android.systemui.screenshot.TimeoutHandler; import com.android.systemui.screenshot.TimeoutHandler;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
@@ -48,7 +48,6 @@ import org.mockito.Captor;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
@Ignore("b/254635291")
@SmallTest @SmallTest
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class ClipboardOverlayControllerTest extends SysuiTestCase { public class ClipboardOverlayControllerTest extends SysuiTestCase {
@@ -97,6 +96,11 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase {
mCallbacks = mOverlayCallbacksCaptor.getValue(); mCallbacks = mOverlayCallbacksCaptor.getValue();
} }
@After
public void tearDown() {
mOverlayController.hideImmediate();
}
@Test @Test
public void test_setClipData_nullData() { public void test_setClipData_nullData() {
ClipData clipData = null; ClipData clipData = null;