commit b39a8f6def76f924d0c6efd79e9b776a70544ec5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 12 06:46:25 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 12 06:46:25 2020 +0000
tree cf4e99e06390bb5e8a5127aa20a7291da774905e
parent 288211a65b9e29381544a079dfb9c8854328de6b
parent 531e6b80801bd06a8da4787777ff18747f9536d2

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

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

Change-Id: I40dfb1caa6169dcd6ecb33c9f582603d2037bee7

tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java

diff --git a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
index 34c6541..0527011 100644
--- a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
+++ b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
@@ -16,6 +16,7 @@
 
 package android.net.cts.util;
 
+import static android.Manifest.permission.ACCESS_WIFI_STATE;
 import static android.Manifest.permission.NETWORK_SETTINGS;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
@@ -331,7 +332,7 @@
      * to them.
      */
     private void clearWifiBlacklist() {
-        runAsShell(NETWORK_SETTINGS, () -> {
+        runAsShell(NETWORK_SETTINGS, ACCESS_WIFI_STATE, () -> {
             for (WifiConfiguration cfg : mWifiManager.getConfiguredNetworks()) {
                 assertTrue(mWifiManager.enableNetwork(cfg.networkId, false /* attemptConnect */));
             }