From 4e86ce6ee22f72c2d64554ab5cd2bc68ee71c8bc Mon Sep 17 00:00:00 2001 From: Sean Pont Date: Fri, 12 Jun 2020 15:42:36 -0700 Subject: Fix testGlobalActions_doesntStealImeControl GlobalActionsDialogTests was not tearing down correctly for lock screen tests. Calling showOrHideDialog a second time cleans things up. Fixes: 158580670 Test: atest GlobalActionsDialogTest Test: atest SystemUITests Test: atest com.android.systemui.globalactions.GlobalActionsImeTest Change-Id: I15fbe1ddc4a1c6d0d5c112c2e066e2c964d0e04b --- .../android/systemui/globalactions/GlobalActionsDialogTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'packages/SystemUI/tests') diff --git a/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java index 329af2b7f62b..3c1cc232f5c9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java @@ -438,6 +438,9 @@ public class GlobalActionsDialogTest extends SysuiTestCase { GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog; assertThat(dialog).isNotNull(); assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.VISIBLE); + + // Dismiss the dialog so that it does not pollute other tests + mGlobalActionsDialog.showOrHideDialog(false, true, mWalletPlugin); } @Test @@ -455,6 +458,9 @@ public class GlobalActionsDialogTest extends SysuiTestCase { GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog; assertThat(dialog).isNotNull(); assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.GONE); + + // Dismiss the dialog so that it does not pollute other tests + mGlobalActionsDialog.showOrHideDialog(false, true, mWalletPlugin); } @Test @@ -473,6 +479,9 @@ public class GlobalActionsDialogTest extends SysuiTestCase { GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog; assertThat(dialog).isNotNull(); assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.GONE); + + // Dismiss the dialog so that it does not pollute other tests + mGlobalActionsDialog.showOrHideDialog(false, true, mWalletPlugin); } private void setupDefaultActions() { -- cgit v1.2.3-59-g8ed1b