commit 91f3eb4ce7e405f381371fbab531f57d7b6c7f18
author David Su <dysu@google.com> Fri Oct 16 18:31:22 2020 +0000
committer David Su <dysu@google.com> Wed Oct 28 17:06:54 2020 +0000
tree d8980bd73c2b8b252e6c9662a6e5d208939997da
parent f87190dc92d75d475c85f03edfdfaa156b1efdd8

DO NOT MERGE CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received

Android Pie CtsNetTestCases AndroidManifest.xml has both
ACCESS_WIFI_STATE & ACCESS_FINE_LOCATION permission.
Thus, it should receive the CONFIGURED_NETWORKS_CHANGED_ACTION
broadcast when a network is removed.

Bug: 159373687
Bug: 171022033
Test: atest CtsNetTestCases
Change-Id: I9d194424469d204c4f95e98b937d67ba728f2122
Merged-In: I4669a6ff79b3d2e99795015e42bfa611cffb9070

tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java

diff --git a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
index 94a0e78..7edb235 100644
--- a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -37,6 +37,7 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WifiConfigCreator;
 
 import java.net.HttpURLConnection;
@@ -475,13 +476,14 @@
             assertFalse(existSSID(SSID1));
             assertFalse(existSSID(SSID2));
 
-            // wait 10 seconds to ensure that broadcast wasn't received
-            Thread.sleep(DURATION);
+            // Should receive CONFIGURED_NETWORKS_CHANGED_ACTION broadcast because CtsNetTestCases'
+            // AndroidManifest.xml has both ACCESS_WIFI_STATE & ACCESS_FINE_LOCATION permissions.
+            PollingCheck.check(
+                    "Didn't receive CONFIGURED_NETWORKS_CHANGED_ACTION broadcast!",
+                    DURATION,
+                    () -> intentHolder.intent != null);
             Intent intent = intentHolder.intent;
-            // Broadcast shouldn't be received because although CtsNetTestCases has
-            // ACCESS_WIFI_STATE permission, it doesn't have ACCESS_FINE_LOCATION permission.
-            // Receivers need both permissions to get the broadcast.
-            assertNull("Unexpected received CONFIGURED_NETWORKS_CHANGED_ACTION broadcast!", intent);
+            assertEquals(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION, intent.getAction());
 
             assertTrue(mWifiManager.saveConfiguration());
         } finally {