admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flip default value of AndroidNetworkMonitor field trials

Browse Source 
getAllNetworksFromCache => true (stop using old Android API)
requestVPN => true (is default in old api)

They have been enabled using field trial
for more than a year.

Bug: webrtc:13741
Change-Id: I288c4067193e95251f79d51e935dce555f6eb198
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361581
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42945}
This commit is contained in:
Jonas Oreland 2024-09-04 12:14:50 +02:00 committed by WebRTC LUCI CQ
parent e540648079
commit 70a59b6900
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
View File

@ -198,8 +198,8 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
this.connectivityManager = connectivityManager; this.connectivityManager = connectivityManager;
this.availableNetworks = availableNetworks; this.availableNetworks = availableNetworks;
this.getAllNetworksFromCache = this.getAllNetworksFromCache =
checkFieldTrial(fieldTrialsString, "getAllNetworksFromCache", false); checkFieldTrial(fieldTrialsString, "getAllNetworksFromCache", true);
this.requestVPN = checkFieldTrial(fieldTrialsString, "requestVPN", false); this.requestVPN = checkFieldTrial(fieldTrialsString, "requestVPN", true);
this.includeOtherUidNetworks = this.includeOtherUidNetworks =
checkFieldTrial(fieldTrialsString, "includeOtherUidNetworks", false); checkFieldTrial(fieldTrialsString, "includeOtherUidNetworks", false);
} }

6
sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
View File

@ -354,7 +354,8 @@ public class NetworkMonitorTest {
@Test @Test
@SmallTest @SmallTest
public void testConnectivityManager_includeOtherUidNetworks_disabled() { public void testConnectivityManager_includeOtherUidNetworks_disabled() {
NetworkRequest request = getNetworkRequestForFieldTrials("includeOtherUidNetworks:false"); NetworkRequest request = getNetworkRequestForFieldTrials(
"requestVPN:false,includeOtherUidNetworks:false");
assertTrue(request.equals(new NetworkRequest.Builder() assertTrue(request.equals(new NetworkRequest.Builder()
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.build())); .build()));
@ -363,7 +364,8 @@ public class NetworkMonitorTest {
@Test @Test
@SmallTest @SmallTest
public void testConnectivityManager_includeOtherUidNetworks_enabled() { public void testConnectivityManager_includeOtherUidNetworks_enabled() {
NetworkRequest request = getNetworkRequestForFieldTrials("includeOtherUidNetworks:true"); NetworkRequest request = getNetworkRequestForFieldTrials(
"requestVPN:false,includeOtherUidNetworks:true");
NetworkRequest.Builder builder = NetworkRequest.Builder builder =
new NetworkRequest.Builder().addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); new NetworkRequest.Builder().addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {