From 65ee636efde96da5cee6aea946847035a56873c2 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Thu, 12 Nov 2020 06:10:21 +0000 Subject: [PATCH] Use ACCESS_WIFI_STATE when clearing wifi blacklist Some tests using CtsNetUtils, like tethering CTS tests, do not hold ACCESS_WIFI_STATE at install time. Use shell permissions to allow the utility to work in such configurations. Bug: 171621759 Test: atest CtsTetheringTest:TetheringManagerTest Original-Change: https://android-review.googlesource.com/1490016 Merged-In: I63e76918421e5deb59fe67a64674348fb8d20265 Change-Id: I63e76918421e5deb59fe67a64674348fb8d20265 --- tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 34c65416b4..05270115b1 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 @@ public final class CtsNetUtils { * 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 */)); }