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 "Use mainline beta flag for NetworkAgent event queueing" into main

Browse source
This commit is contained in:
Junyu Lai 2025-08-14 01:19:15 -07:00 • committed by Android (Google) Code Review
commit 0c6b14587b
2 changed files with 50 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -167,7 +167,7 @@ import static com.android.server.connectivity.ConnectivityFlags.DELAY_DESTROY_SO
import static com.android.server.connectivity.ConnectivityFlags.INGRESS_TO_VPN_ADDRESS_FILTERING;
import static com.android.server.connectivity.ConnectivityFlags.NAMESPACE_TETHERING_BOOT;
import static com.android.server.connectivity.ConnectivityFlags.QUEUE_CALLBACKS_FOR_FROZEN_APPS;
import static com.android.server.connectivity.ConnectivityFlags.QUEUE_NETWORK_AGENT_EVENTS_IN_SYSTEM_SERVER;
import static com.android.server.connectivity.ConnectivityFlags.QUEUE_NETWORK_AGENT_EVENTS_AFTER_B;
import static com.android.server.connectivity.ConnectivityFlags.REQUEST_RESTRICTED_WIFI;
import static com.android.server.connectivity.ConnectivityFlags.SATISFIED_BY_LOCAL_NETWORK_METRICS;
import static com.android.server.connectivity.ConnectivityFlags.USE_SATELLITE_REPORTED_SUSPENDED_AND_ROAMING;
@ -2044,6 +2044,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
return SdkLevel.isAtLeastT() &&
com.android.tethering.mainline.beta.Flags.bluetoothTetheringRandomizedAddress();
}
/**
* Whether queue network agent events in the system server should be enabled.
*/
public boolean shouldQueueNetworkAgentEventsInSystemServer() {
return com.android.tethering.mainline.beta.Flags
.queueNetworkAgentEventsInSystemServer();
}
}
public ConnectivityService(Context context) {
@ -2157,9 +2165,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
mUseDeclaredMethodsForCallbacksEnabled =
mDeps.isFeatureNotChickenedOut(context,
ConnectivityFlags.USE_DECLARED_METHODS_FOR_CALLBACKS);
mQueueNetworkAgentEventsInSystemServer = mDeps.isAtLeastB()
mQueueNetworkAgentEventsInSystemServer = (mDeps.isAtLeastB()
&& mDeps.isFeatureNotChickenedOut(context,
ConnectivityFlags.QUEUE_NETWORK_AGENT_EVENTS_IN_SYSTEM_SERVER);
ConnectivityFlags.QUEUE_NETWORK_AGENT_EVENTS_AFTER_B))
|| mDeps.shouldQueueNetworkAgentEventsInSystemServer();
mSupportEarlyLinkPropertiesUpdateForVPN = mDeps.isFeatureNotChickenedOut(context,
ConnectivityFlags.EARLY_LINK_PROPERTIES_UPDATE_FOR_VPN);
// registerUidFrozenStateChangedCallback is only available on U+
@ -15791,7 +15800,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
switch (featureFlag) {
case INGRESS_TO_VPN_ADDRESS_FILTERING:
return mIngressToVpnAddressFiltering;
case QUEUE_NETWORK_AGENT_EVENTS_IN_SYSTEM_SERVER:
case QUEUE_NETWORK_AGENT_EVENTS_AFTER_B:
case com.android.tethering.mainline.beta.Flags
.FLAG_QUEUE_NETWORK_AGENT_EVENTS_IN_SYSTEM_SERVER:
return mQueueNetworkAgentEventsInSystemServer;
case CLOSE_QUIC_CONNECTION:
return mCloseQuicConnection;

2
service/src/com/android/server/connectivity/ConnectivityFlags.java
View file

@ -62,7 +62,7 @@ public final class ConnectivityFlags {
public static final String QUEUE_CALLBACKS_FOR_FROZEN_APPS =
"queue_callbacks_for_frozen_apps";
public static final String QUEUE_NETWORK_AGENT_EVENTS_IN_SYSTEM_SERVER =
public static final String QUEUE_NETWORK_AGENT_EVENTS_AFTER_B =
"queue_network_agent_events_in_system_server";
public static final String CLOSE_QUIC_CONNECTION = "close_quic_connection";