Merge "fix the problem that testNetworkSettingsPermission case can not detect all apps whose holding the NETWORK_SETTINGS permission" am: 9228a471cc am: 8634565225 am: 1737d5d1ac
Change-Id: I44338c18e76930f54230b31ee4a0834d9b047f25
diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
index 3ed157a..3af58f6 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -52,6 +52,7 @@
import com.android.compatibility.common.util.SystemUtil;
+import java.lang.StringBuilder;
import java.net.HttpURLConnection;
import java.net.URL;
import java.security.MessageDigest;
@@ -831,6 +832,7 @@
final List<PackageInfo> holding = pm.getPackagesHoldingPermissions(new String[] {
android.Manifest.permission.NETWORK_SETTINGS
}, PackageManager.MATCH_UNINSTALLED_PACKAGES);
+ StringBuilder stringBuilder = new StringBuilder();
for (PackageInfo pi : holding) {
String packageName = pi.packageName;
@@ -845,10 +847,13 @@
continue;
}
if (!allowedUIDs.contains(uid)) {
- fail("The NETWORK_SETTINGS permission must not be held by " + packageName
- + ":" + uid + " and must be revoked for security reasons");
+ stringBuilder.append("The NETWORK_SETTINGS permission must not be held by "
+ + packageName + ":" + uid + " and must be revoked for security reasons\n");
}
}
+ if (stringBuilder.length() > 0) {
+ fail(stringBuilder.toString());
+ }
}
/**