Merge "Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi"

am: dc714602ca

Change-Id: I1bba2575132f587f03251a21913d34c6428f9d82
This commit is contained in:
Steven Liu
2019-11-08 09:27:05 -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));
}
}