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

Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oc-dev am: dca5e4600d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12773445

Change-Id: I5e3ab3f0ae09176cd0b28d596634df0ae9469ba5
This commit is contained in:
David Su
2020-10-15 18:10:20 +00:00
committed by Automerger Merge Worker
parent 503542058b cd2fe6e08a
commit 9b4c3d90fe
1 changed files with 21 additions and 0 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,12 +411,33 @@ 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());