From 70a59b6900d28d3e393e3de1eb9a435e43a61cb6 Mon Sep 17 00:00:00 2001 From: Jonas Oreland Date: Wed, 4 Sep 2024 12:14:50 +0200 Subject: [PATCH] Flip default value of AndroidNetworkMonitor field trials MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Zoé Lepaul Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#42945} --- sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java | 4 ++-- .../src/org/webrtc/NetworkMonitorTest.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java index a6f24c2858..1fb7e5b58d 100644 --- a/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java +++ b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java @@ -198,8 +198,8 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo this.connectivityManager = connectivityManager; this.availableNetworks = availableNetworks; this.getAllNetworksFromCache = - checkFieldTrial(fieldTrialsString, "getAllNetworksFromCache", false); - this.requestVPN = checkFieldTrial(fieldTrialsString, "requestVPN", false); + checkFieldTrial(fieldTrialsString, "getAllNetworksFromCache", true); + this.requestVPN = checkFieldTrial(fieldTrialsString, "requestVPN", true); this.includeOtherUidNetworks = checkFieldTrial(fieldTrialsString, "includeOtherUidNetworks", false); } diff --git a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java index d81bce2b2e..628b6bd282 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java @@ -354,7 +354,8 @@ public class NetworkMonitorTest { @Test @SmallTest public void testConnectivityManager_includeOtherUidNetworks_disabled() { - NetworkRequest request = getNetworkRequestForFieldTrials("includeOtherUidNetworks:false"); + NetworkRequest request = getNetworkRequestForFieldTrials( + "requestVPN:false,includeOtherUidNetworks:false"); assertTrue(request.equals(new NetworkRequest.Builder() .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .build())); @@ -363,7 +364,8 @@ public class NetworkMonitorTest { @Test @SmallTest public void testConnectivityManager_includeOtherUidNetworks_enabled() { - NetworkRequest request = getNetworkRequestForFieldTrials("includeOtherUidNetworks:true"); + NetworkRequest request = getNetworkRequestForFieldTrials( + "requestVPN:false,includeOtherUidNetworks:true"); NetworkRequest.Builder builder = new NetworkRequest.Builder().addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {