Merge "fix the problem that testNetworkSettingsPermission case can not detect all apps whose holding the NETWORK_SETTINGS permission" am: 9228a471cc am: 8634565225
Change-Id: I0f3f4139fc7dc534699a6642672f7515002fc2f3
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 3e47764..5b8a8d5 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -49,6 +49,7 @@
import com.android.compatibility.common.util.SystemUtil;
+import java.lang.StringBuilder;
import java.net.HttpURLConnection;
import java.net.URL;
import java.security.MessageDigest;
@@ -770,6 +771,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;
@@ -784,10 +786,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());
+ }
}
/**