commit 70a59b6900d28d3e393e3de1eb9a435e43a61cb6
author Jonas Oreland <jonaso@webrtc.org> Wed Sep 04 10:14:50 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 04 11:20:34 2024
tree 365df31716e2e92ee97abea0c71097e76b1dc762
parent e540648079363caa1a18a63157258f20e301d45b

Flip default value of AndroidNetworkMonitor field trials

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}

sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java

diff --git a/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
index a6f24c2..1fb7e5b 100644
--- a/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
+++ b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
@@ -198,8 +198,8 @@
       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);
     }

sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java

diff --git a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
index d81bce2..628b6bd 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
@@ -354,7 +354,8 @@
   @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 @@
   @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) {