LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-cts-dev

Browse Source
This commit is contained in:
Treehugger Robot
2020-11-03 19:34:27 +00:00
committed by Gerrit Code Review
parent 56c21dd47b a0790fe3fa
commit 3efc6792c3
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
View File

@@ -411,33 +411,12 @@ public class WifiManagerTest extends AndroidTestCase {
assertFalse(existSSID(SSID1)); assertFalse(existSSID(SSID1));
assertTrue(existSSID(SSID2)); 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 // Remove a WifiConfig
assertTrue(mWifiManager.removeNetwork(netId)); assertTrue(mWifiManager.removeNetwork(netId));
assertFalse(mWifiManager.removeNetwork(notExist)); assertFalse(mWifiManager.removeNetwork(notExist));
assertFalse(existSSID(SSID1)); assertFalse(existSSID(SSID1));
assertFalse(existSSID(SSID2)); 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()); assertTrue(mWifiManager.saveConfiguration());
} finally { } finally {
reEnableNetworks(enabledSsids, mWifiManager.getConfiguredNetworks()); reEnableNetworks(enabledSsids, mWifiManager.getConfiguredNetworks());