Merge "Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi" am: dc714602ca

am: d71b50bd7d

Change-Id: I67fb9a1f02ad24a9cc9b553418d42ba29e1dc28a
This commit is contained in:
Steven Liu
2019-11-08 09:31:25 -08:00
committed by android-build-merger

View File

@@ -921,9 +921,9 @@ public class WifiManagerTest extends AndroidTestCase {
.distinct()
.collect(Collectors.toList());
if (uniquePackageNames.size() > 1) {
fail("The NETWORK_CARRIER_PROVISIONING permission must not be held by more than one "
+ "application, but is held by " + uniquePackageNames.size() + " applications: "
if (uniquePackageNames.size() > 2) {
fail("The NETWORK_CARRIER_PROVISIONING permission must not be held by more than two "
+ "applications, but is held by " + uniquePackageNames.size() + " applications: "
+ String.join(", ", uniquePackageNames));
}
}