Merge changes I105ee1d6,I55817132 into main

* changes:
  Update ENABLE_MATCH_NON_THREAD_LOCAL_NETWORKS flag to target sdk 37
  Adopt mainline beta program for local network agent
This commit is contained in:
Treehugger Robot 2025-08-21 10:28:00 -07:00 • committed by Android (Google) Code Review
commit 14debeb714

View file

@ -154,12 +154,12 @@ public final class ConnectivityCompatChanges {
/**
* Enable match non-threads local networks.
*
* Apps targeting a release after V can have NetworkRequests matches non-thread local networks.
* Apps targeting a release after B can have NetworkRequests matches non-thread local networks.
*
* @hide
*/
@ChangeId
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM)
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.BAKLAVA)
public static final long ENABLE_MATCH_NON_THREAD_LOCAL_NETWORKS = 349487600L;
private ConnectivityCompatChanges() {