Merge "ConnectivityServiceTest: Mark unaudited PendingIntents with FLAG_MUTABLE_UNAUDITED" (ae51ff44) · Commits · e / os / android_frameworks_base

tests/net/java/com/android/server/ConnectivityServiceTest.java

+28 −9

Original line number	Original line	Diff line number	Diff line
	@@ -2517,7 +2517,10 @@ public class ConnectivityServiceTest {

	@Test		@Test
	public void testNoMutableNetworkRequests() throws Exception {		public void testNoMutableNetworkRequests() throws Exception {
	PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, new Intent("a"), 0);		// TODO(b/173157160) Please replace FLAG_MUTABLE_UNAUDITED below
			// with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.
			PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, new Intent("a"),
			PendingIntent.FLAG_MUTABLE_UNAUDITED);
	NetworkRequest request1 = new NetworkRequest.Builder()		NetworkRequest request1 = new NetworkRequest.Builder()
	.addCapability(NET_CAPABILITY_VALIDATED)		.addCapability(NET_CAPABILITY_VALIDATED)
	.build();		.build();
	@@ -3177,17 +3180,21 @@ public class ConnectivityServiceTest {
	assertThrows(SecurityException.class, () ->		assertThrows(SecurityException.class, () ->
	mCm.registerNetworkCallback(r, new NetworkCallback()));		mCm.registerNetworkCallback(r, new NetworkCallback()));

			// TODO(b/173157160) Please replace FLAG_MUTABLE_UNAUDITED below
			// with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.
	assertThrows(SecurityException.class, () ->		assertThrows(SecurityException.class, () ->
	mCm.registerNetworkCallback(r, PendingIntent.getService(		mCm.registerNetworkCallback(r, PendingIntent.getService(
	mServiceContext, 0, new Intent(), 0)));		mServiceContext, 0, new Intent(), PendingIntent.FLAG_MUTABLE_UNAUDITED)));

	// Requesting a Network with signal strength should get IllegalArgumentException.		// Requesting a Network with signal strength should get IllegalArgumentException.
	assertThrows(IllegalArgumentException.class, () ->		assertThrows(IllegalArgumentException.class, () ->
	mCm.requestNetwork(r, new NetworkCallback()));		mCm.requestNetwork(r, new NetworkCallback()));

			// TODO(b/173157160) Please replace FLAG_MUTABLE_UNAUDITED below
			// with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.
	assertThrows(IllegalArgumentException.class, () ->		assertThrows(IllegalArgumentException.class, () ->
	mCm.requestNetwork(r, PendingIntent.getService(		mCm.requestNetwork(r, PendingIntent.getService(
	mServiceContext, 0, new Intent(), 0)));		mServiceContext, 0, new Intent(), PendingIntent.FLAG_MUTABLE_UNAUDITED)));
	}		}

	@Test		@Test
	@@ -4651,12 +4658,16 @@ public class ConnectivityServiceTest {
	}		}
	j = 0;		j = 0;
	while (j++ < INTENTS / 2) {		while (j++ < INTENTS / 2) {
	PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, new Intent("a" + j), 0);		// TODO(b/173157160) Please replace FLAG_MUTABLE_UNAUDITED below
			// with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.
			PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, new Intent("a" + j), PendingIntent.FLAG_MUTABLE_UNAUDITED);
	mCm.requestNetwork(networkRequest, pi);		mCm.requestNetwork(networkRequest, pi);
	registered.add(pi);		registered.add(pi);
	}		}
	while (j++ < INTENTS) {		while (j++ < INTENTS) {
	PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, new Intent("b" + j), 0);		// TODO(b/173157160) Please replace FLAG_MUTABLE_UNAUDITED below
			// with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.
			PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, new Intent("b" + j), PendingIntent.FLAG_MUTABLE_UNAUDITED);
	mCm.registerNetworkCallback(networkRequest, pi);		mCm.registerNetworkCallback(networkRequest, pi);
	registered.add(pi);		registered.add(pi);
	}		}
	@@ -4670,11 +4681,15 @@ public class ConnectivityServiceTest {
	);		);
	assertThrows(TooManyRequestsException.class, () ->		assertThrows(TooManyRequestsException.class, () ->
	mCm.requestNetwork(networkRequest,		mCm.requestNetwork(networkRequest,
	PendingIntent.getBroadcast(mContext, 0, new Intent("c"), 0))		// TODO(b/173157160) Please replace FLAG_MUTABLE_UNAUDITED below
			// with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.
			PendingIntent.getBroadcast(mContext, 0, new Intent("c"), PendingIntent.FLAG_MUTABLE_UNAUDITED))
	);		);
	assertThrows(TooManyRequestsException.class, () ->		assertThrows(TooManyRequestsException.class, () ->
	mCm.registerNetworkCallback(networkRequest,		mCm.registerNetworkCallback(networkRequest,
	PendingIntent.getBroadcast(mContext, 0, new Intent("d"), 0))		// TODO(b/173157160) Please replace FLAG_MUTABLE_UNAUDITED below
			// with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.
			PendingIntent.getBroadcast(mContext, 0, new Intent("d"), PendingIntent.FLAG_MUTABLE_UNAUDITED))
	);		);

	for (Object o : registered) {		for (Object o : registered) {
	@@ -4703,16 +4718,20 @@ public class ConnectivityServiceTest {
	waitForIdle();		waitForIdle();

	for (int i = 0; i < MAX_REQUESTS; i++) {		for (int i = 0; i < MAX_REQUESTS; i++) {
			// TODO(b/173157160) Please replace FLAG_MUTABLE_UNAUDITED below
			// with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.
	PendingIntent pendingIntent =		PendingIntent pendingIntent =
	PendingIntent.getBroadcast(mContext, 0, new Intent("e" + i), 0);		PendingIntent.getBroadcast(mContext, 0, new Intent("e" + i), PendingIntent.FLAG_MUTABLE_UNAUDITED);
	mCm.requestNetwork(networkRequest, pendingIntent);		mCm.requestNetwork(networkRequest, pendingIntent);
	mCm.unregisterNetworkCallback(pendingIntent);		mCm.unregisterNetworkCallback(pendingIntent);
	}		}
	waitForIdle();		waitForIdle();

	for (int i = 0; i < MAX_REQUESTS; i++) {		for (int i = 0; i < MAX_REQUESTS; i++) {
			// TODO(b/173157160) Please replace FLAG_MUTABLE_UNAUDITED below
			// with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.
	PendingIntent pendingIntent =		PendingIntent pendingIntent =
	PendingIntent.getBroadcast(mContext, 0, new Intent("f" + i), 0);		PendingIntent.getBroadcast(mContext, 0, new Intent("f" + i), PendingIntent.FLAG_MUTABLE_UNAUDITED);
	mCm.registerNetworkCallback(networkRequest, pendingIntent);		mCm.registerNetworkCallback(networkRequest, pendingIntent);
	mCm.unregisterNetworkCallback(pendingIntent);		mCm.unregisterNetworkCallback(pendingIntent);
	}		}