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

Update ENABLE_MATCH_NON_THREAD_LOCAL_NETWORKS flag to target sdk 37

Browse source 
The ENABLE_MATCH_NON_THREAD_LOCAL_NETWORKS compatibility flag is
now enabled for apps targeting SDK 37 or higher.

Previously, this flag was configured to enable for
Baklava (SDK 36) or higher. This is no-op because
there is no tethering network agent presents.

While the tethering network agents planned to be enabled in
25Q4, this adjustment allows developers sufficient time
to adapt to the behavior change where NetworkRequests
will match non-Thread local networks.

Flag: com.android.tethering.mainline.beta.tethering_and_p2p_go_local_agent
Test: atest ConnectivityCoverageTests --update-device \
      --test-filter '.*Connectivity.*'
Bug: 420590461
Change-Id: I105ee1d677c6beb12b4dccd109c01ef5ff2717d3
This commit is contained in:
Junyu Lai 2025-08-14 22:38:33 +08:00
commit 1c513a6a6f
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3409,8 +3409,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void maybeDisableLocalNetworkMatching(NetworkCapabilities nc, int callingUid) {
// If disabled, NetworkRequest cannot match non-thread local networks even if
// specified explicitly. Compat change is enabled by default on apps targeting B+.
// Agent should not be visible on U- even if it's rolled out.
// specified explicitly. Compat change is enabled by default on apps targeting sdk
// level 37. Agent should not be visible on platform sdk level 36- even if it's rolled out.
// Note that on V+, isChangeEnabled returns false for
// ENABLE_MATCH_NON_THREAD_LOCAL_NETWORKS even if the app is targeting higher SDK
// due to b/401088586.
// TODO: Update the gating logic once SDK int APIs are ready.
nc.setMatchNonThreadLocalNetworks(mDeps.isAtLeastV() && mDeps.isChangeEnabled(
ENABLE_MATCH_NON_THREAD_LOCAL_NETWORKS, callingUid));
if (mDeps.isChangeEnabled(ENABLE_MATCH_LOCAL_NETWORK, callingUid)) {