Merge "Merge cherrypicks of [1487446] into oreo-cts-release" into oreo-cts-release
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 c5d0d4f..44b49c0 100644
--- a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -411,33 +411,12 @@
assertFalse(existSSID(SSID1));
assertTrue(existSSID(SSID2));
- // Need an effectively-final holder because we need to modify inner Intent in callback.
- class IntentHolder {
- Intent intent;
- }
- IntentHolder intentHolder = new IntentHolder();
- mContext.registerReceiver(new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- Log.i(TAG, "Received CONFIGURED_NETWORKS_CHANGED_ACTION broadcast: " + intent);
- intentHolder.intent = intent;
- }
- }, new IntentFilter(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION));
-
// Remove a WifiConfig
assertTrue(mWifiManager.removeNetwork(netId));
assertFalse(mWifiManager.removeNetwork(notExist));
assertFalse(existSSID(SSID1));
assertFalse(existSSID(SSID2));
- // wait 10 seconds to ensure that broadcast wasn't received
- Thread.sleep(DURATION);
- 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);
-
assertTrue(mWifiManager.saveConfiguration());
} finally {
reEnableNetworks(enabledSsids, mWifiManager.getConfiguredNetworks());
