joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes I71abf9d0,I57f25f5e,If6b15419 into main am: 6f2b294fd0 am: 4a560d10d4

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548745

Change-Id: I4f1d5be3272b8864b78ea698142fc3c535ae4890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jean Chalard 2025-03-18 04:17:07 -07:00 • committed by Automerger Merge Worker
commit 57e43de86f
2 changed files with 159 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View file

@ -2200,6 +2200,7 @@ public class ConnectivityServiceTest {
case ConnectivityFlags.DELAY_DESTROY_SOCKETS:
case ConnectivityFlags.USE_DECLARED_METHODS_FOR_CALLBACKS:
case ConnectivityFlags.QUEUE_CALLBACKS_FOR_FROZEN_APPS:
case ConnectivityFlags.QUEUE_NETWORK_AGENT_EVENTS_IN_SYSTEM_SERVER:
return true;
default:
throw new UnsupportedOperationException("Unknown flag " + name

1
tests/unit/java/com/android/server/connectivityservice/base/CSTest.kt
View file

@ -169,6 +169,7 @@ open class CSTest {
it[ConnectivityFlags.DELAY_DESTROY_SOCKETS] = true
it[ConnectivityFlags.USE_DECLARED_METHODS_FOR_CALLBACKS] = true
it[ConnectivityFlags.QUEUE_CALLBACKS_FOR_FROZEN_APPS] = true
it[ConnectivityFlags.QUEUE_NETWORK_AGENT_EVENTS_IN_SYSTEM_SERVER] = true
}
fun setFeatureEnabled(flag: String, enabled: Boolean) = enabledFeatures.set(flag, enabled)