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

Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" am: f5ae03550a am: 85dfa5cae0 am: 531e6b8080

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490016

Change-Id: I40dfb1caa6169dcd6ecb33c9f582603d2037bee7
This commit is contained in:
Treehugger Robot
2020-11-12 06:46:25 +00:00
committed by Automerger Merge Worker
parent 288211a65b 531e6b8080
commit b39a8f6def
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
View File

@@ -16,6 +16,7 @@
package android.net.cts.util; package android.net.cts.util;
import static android.Manifest.permission.ACCESS_WIFI_STATE;
import static android.Manifest.permission.NETWORK_SETTINGS; import static android.Manifest.permission.NETWORK_SETTINGS;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
@@ -331,7 +332,7 @@ public final class CtsNetUtils {
* to them. * to them.
*/ */
private void clearWifiBlacklist() { private void clearWifiBlacklist() {
runAsShell(NETWORK_SETTINGS, () -> { runAsShell(NETWORK_SETTINGS, ACCESS_WIFI_STATE, () -> {
for (WifiConfiguration cfg : mWifiManager.getConfiguredNetworks()) { for (WifiConfiguration cfg : mWifiManager.getConfiguredNetworks()) {
assertTrue(mWifiManager.enableNetwork(cfg.networkId, false /* attemptConnect */)); assertTrue(mWifiManager.enableNetwork(cfg.networkId, false /* attemptConnect */));
} }