LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix network callback with the same PendingIntent does not release"

Browse Source
This commit is contained in:
Treehugger Robot
2021-06-30 21:43:15 +00:00
committed by Gerrit Code Review
parent 4bb141787b 1cc3f17413
commit 6d908a513a
3 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
service/src/com/android/server/ConnectivityService.java
View File

@@ -6280,7 +6280,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
callingAttributionTag);
if (VDBG) log("pendingListenForNetwork for " + nri);
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_LISTENER, nri));
mHandler.sendMessage(mHandler.obtainMessage(
EVENT_REGISTER_NETWORK_LISTENER_WITH_INTENT, nri));
}
/** Returns the next Network provider ID. */

9
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -72,6 +72,7 @@ import static android.system.OsConstants.AF_UNSPEC;
import static com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity;
import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
import static com.android.modules.utils.build.SdkLevel.isAtLeastS;
import static com.android.networkstack.apishim.ConstantsShim.BLOCKED_REASON_LOCKDOWN_VPN;
import static com.android.networkstack.apishim.ConstantsShim.BLOCKED_REASON_NONE;
import static com.android.testutils.MiscAsserts.assertThrows;
@@ -936,8 +937,8 @@ public class ConnectivityManagerTest {
// noticeably flaky.
Thread.sleep(NO_CALLBACK_TIMEOUT_MS);
// TODO: BUG (b/189868426): this should also apply to listens
if (!useListen) {
// For R- frameworks, listens will receive duplicated callbacks. See b/189868426.
if (isAtLeastS() || !useListen) {
assertEquals("PendingIntent should only be received once", 1, receivedCount.get());
}
} finally {
@@ -952,8 +953,8 @@ public class ConnectivityManagerTest {
boolean useListen) {
assertArrayEquals(filed.networkCapabilities.getCapabilities(),
broadcasted.networkCapabilities.getCapabilities());
// TODO: BUG (b/189868426): this should also apply to listens
if (useListen) return;
// For R- frameworks, listens will receive duplicated callbacks. See b/189868426.
if (!isAtLeastS() && useListen) return;
assertArrayEquals(filed.networkCapabilities.getTransportTypes(),
broadcasted.networkCapabilities.getTransportTypes());
}

70
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -5747,37 +5747,59 @@ public class ConnectivityServiceTest {
@Test
public void testNetworkCallbackMaximum() throws Exception {
final int MAX_REQUESTS = 100;
final int CALLBACKS = 89;
final int INTENTS = 11;
final int CALLBACKS = 87;
final int DIFF_INTENTS = 10;
final int SAME_INTENTS = 10;
final int SYSTEM_ONLY_MAX_REQUESTS = 250;
assertEquals(MAX_REQUESTS, CALLBACKS + INTENTS);
// Assert 1 (Default request filed before testing) + CALLBACKS + DIFF_INTENTS +
// 1 (same intent) = MAX_REQUESTS - 1, since the capacity is MAX_REQUEST - 1.
assertEquals(MAX_REQUESTS - 1, 1 + CALLBACKS + DIFF_INTENTS + 1);
NetworkRequest networkRequest = new NetworkRequest.Builder().build();
ArrayList<Object> registered = new ArrayList<>();
int j = 0;
while (j++ < CALLBACKS / 2) {
NetworkCallback cb = new NetworkCallback();
mCm.requestNetwork(networkRequest, cb);
for (int j = 0; j < CALLBACKS; j++) {
final NetworkCallback cb = new NetworkCallback();
if (j < CALLBACKS / 2) {
mCm.requestNetwork(networkRequest, cb);
} else {
mCm.registerNetworkCallback(networkRequest, cb);
}
registered.add(cb);
}
while (j++ < CALLBACKS) {
NetworkCallback cb = new NetworkCallback();
mCm.registerNetworkCallback(networkRequest, cb);
registered.add(cb);
// Since ConnectivityService will de-duplicate the request with the same intent,
// register multiple times does not really increase multiple requests.
final PendingIntent same_pi = PendingIntent.getBroadcast(mContext, 0 /* requestCode */,
new Intent("same"), FLAG_IMMUTABLE);
for (int j = 0; j < SAME_INTENTS; j++) {
mCm.registerNetworkCallback(networkRequest, same_pi);
// Wait for the requests with the same intent to be de-duplicated. Because
// ConnectivityService side incrementCountOrThrow in binder, decrementCount in handler
// thread, waitForIdle is needed to ensure decrementCount being invoked for same intent
// requests before doing further tests.
waitForIdle();
}
j = 0;
while (j++ < INTENTS / 2) {
final PendingIntent pi = PendingIntent.getBroadcast(mContext, 0 /* requestCode */,
new Intent("a" + j), FLAG_IMMUTABLE);
mCm.requestNetwork(networkRequest, pi);
registered.add(pi);
for (int j = 0; j < SAME_INTENTS; j++) {
mCm.requestNetwork(networkRequest, same_pi);
// Wait for the requests with the same intent to be de-duplicated.
// Refer to the reason above.
waitForIdle();
}
while (j++ < INTENTS) {
final PendingIntent pi = PendingIntent.getBroadcast(mContext, 0 /* requestCode */,
new Intent("b" + j), FLAG_IMMUTABLE);
mCm.registerNetworkCallback(networkRequest, pi);
registered.add(pi);
registered.add(same_pi);
for (int j = 0; j < DIFF_INTENTS; j++) {
if (j < DIFF_INTENTS / 2) {
final PendingIntent pi = PendingIntent.getBroadcast(mContext, 0 /* requestCode */,
new Intent("a" + j), FLAG_IMMUTABLE);
mCm.requestNetwork(networkRequest, pi);
registered.add(pi);
} else {
final PendingIntent pi = PendingIntent.getBroadcast(mContext, 0 /* requestCode */,
new Intent("b" + j), FLAG_IMMUTABLE);
mCm.registerNetworkCallback(networkRequest, pi);
registered.add(pi);
}
}
// Test that the limit is enforced when MAX_REQUESTS simultaneous requests are added.
@@ -5827,10 +5849,10 @@ public class ConnectivityServiceTest {
for (Object o : registered) {
if (o instanceof NetworkCallback) {
mCm.unregisterNetworkCallback((NetworkCallback)o);
mCm.unregisterNetworkCallback((NetworkCallback) o);
}
if (o instanceof PendingIntent) {
mCm.unregisterNetworkCallback((PendingIntent)o);
mCm.unregisterNetworkCallback((PendingIntent) o);
}
}
waitForIdle();