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 "Only apply the early network agent creation on B" into main am: 4e2efc94f5

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

Change-Id: Iba38ec6cafb3687343a7024cb41c2f22024fbd94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2025-03-21 10:05:31 -07:00 • committed by Automerger Merge Worker
commit 986dcd0769
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
service/src/com/android/server/ConnectivityService.java
View file

@ -1938,8 +1938,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mUseDeclaredMethodsForCallbacksEnabled =
mDeps.isFeatureNotChickenedOut(context,
ConnectivityFlags.USE_DECLARED_METHODS_FOR_CALLBACKS);
mQueueNetworkAgentEventsInSystemServer =
mDeps.isFeatureNotChickenedOut(context,
mQueueNetworkAgentEventsInSystemServer = mDeps.isAtLeastB()
&& mDeps.isFeatureNotChickenedOut(context,
ConnectivityFlags.QUEUE_NETWORK_AGENT_EVENTS_IN_SYSTEM_SERVER);
// registerUidFrozenStateChangedCallback is only available on U+
mQueueCallbacksForFrozenApps = mDeps.isAtLeastU()

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

@ -2241,7 +2241,8 @@ public class ConnectivityServiceTest {
private static final int VERSION_T = 3;
private static final int VERSION_U = 4;
private static final int VERSION_V = 5;
private static final int VERSION_MAX = VERSION_V;
private static final int VERSION_B = 6;
private static final int VERSION_MAX = VERSION_B;
private int mSdkLevel = VERSION_UNMOCKED;
private void setBuildSdk(final int sdkLevel) {
@ -2270,6 +2271,12 @@ public class ConnectivityServiceTest {
: mSdkLevel >= VERSION_U;
}
@Override
public boolean isAtLeastB() {
return mSdkLevel == VERSION_UNMOCKED ? super.isAtLeastB()
: mSdkLevel >= VERSION_B;
}
@Override
public BpfNetMaps getBpfNetMaps(Context context, INetd netd,
InterfaceTracker interfaceTracker) {