commit 28a690dc79c2f9e954b05c25739699cabbbe9623
author Aaron Huang <huangaaron@google.com> Wed Aug 03 02:22:55 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 03 02:22:55 2022 +0000
tree 98a7f0afc9c2cc05304c454a7ac88199de4db5df
parent 7dce599f421ae883b670ae76aa0dca761d551ec9
parent 7fcbc2ecbdca9bd49eb1c08243b4eeaabb59118c

Merge "Fix flaky testNotifyNoInternetAsDialogWhenHighPriority"

tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java

diff --git a/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java b/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
index 2cf5d8e..53097b6 100644
--- a/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
+++ b/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
@@ -385,11 +385,13 @@
         doReturn(true).when(mResources).getBoolean(
                 R.bool.config_notifyNoInternetAsDialogWhenHighPriority);
 
+        final Instrumentation instr = InstrumentationRegistry.getInstrumentation();
+        UiDevice.getInstance(instr).pressHome();
+
         mManager.showNotification(TEST_NOTIF_ID, NETWORK_SWITCH, mWifiNai, mCellNai, null, false);
         // Non-"no internet" notifications are not affected
         verify(mNotificationManager).notify(eq(TEST_NOTIF_TAG), eq(NETWORK_SWITCH.eventId), any());
 
-        final Instrumentation instr = InstrumentationRegistry.getInstrumentation();
         final Context ctx = instr.getContext();
         final String testAction = "com.android.connectivity.coverage.TEST_DIALOG";
         final Intent intent = new Intent(testAction)