From a0790fe3fa4f8dc35987e850c11d1021dde98b04 Mon Sep 17 00:00:00 2001 From: David Su Date: Tue, 3 Nov 2020 03:01:13 +0000 Subject: [PATCH] DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" This reverts commit 956f4dc23182fb7c42d29546b466e117453f6a75. Reason for revert: b/171022033 Change-Id: I6f28a18ef2487fda7a205bc8bfe9d0835b553b07 --- .../android/net/wifi/cts/WifiManagerTest.java | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java index c5d0d4f0ad..44b49c0274 100644 --- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java +++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java @@ -411,33 +411,12 @@ public class WifiManagerTest extends AndroidTestCase { 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());