From ea0f9a0a19fbc602f4fc5ce0c8d9a71aa77f50e4 Mon Sep 17 00:00:00 2001 From: Jonas Oreland Date: Tue, 29 Mar 2022 14:13:06 +0200 Subject: [PATCH] Fix string that will not make field trial parser crash (in debug) Ironic :( The "field trial guy" constructing a invalid string, if only there would have been a builder instead... I tested the code several times...but not with debug build... Bug: webrtc:13741 Change-Id: If3caad0f5533fc150ffd6a34a89ab84f3f0264aa Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256979 Reviewed-by: Harald Alvestrand Commit-Queue: Jonas Oreland Cr-Commit-Position: refs/heads/main@{#36370} --- .../api/org/webrtc/NetworkMonitorAutoDetect.java | 4 ++-- .../src/org/webrtc/NetworkMonitorTest.java | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java index 052e7c80a9..750dcb303c 100644 --- a/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java +++ b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java @@ -193,9 +193,9 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo } private static boolean checkFieldTrial(String fieldTrials, String key, boolean defaultValue) { - if (fieldTrials.contains(key + "/Enabled")) { + if (fieldTrials.contains(key + ":true")) { return true; - } else if (fieldTrials.contains(key + "/Disabled")) { + } else if (fieldTrials.contains(key + ":false")) { return false; } return defaultValue; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java index a0a86d5d78..fc87806dec 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java @@ -305,7 +305,7 @@ public class NetworkMonitorTest { ConnectivityManagerDelegate delegate = new ConnectivityManagerDelegate( (ConnectivityManager) InstrumentationRegistry.getTargetContext().getSystemService( Context.CONNECTIVITY_SERVICE), - availableNetworks, "getAllNetworksFromCache/Enabled/"); + availableNetworks, "getAllNetworksFromCache:true"); Network[] networks = delegate.getAllNetworks(); assertTrue(networks.length == 0); @@ -321,7 +321,8 @@ public class NetworkMonitorTest { @Test @SmallTest public void testConnectivityManager_requestVPN_disabled() { - NetworkRequest request = getNetworkRequestForFieldTrials("requestVPN/Disabled"); + NetworkRequest request = + getNetworkRequestForFieldTrials("anyothertext,requestVPN:false,anyothertext"); assertTrue(request.equals(new NetworkRequest.Builder() .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .build())); @@ -330,7 +331,7 @@ public class NetworkMonitorTest { @Test @SmallTest public void testConnectivityManager_requestVPN_enabled() { - NetworkRequest request = getNetworkRequestForFieldTrials("requestVPN/Enabled"); + NetworkRequest request = getNetworkRequestForFieldTrials("requestVPN:true"); assertTrue(request.equals(new NetworkRequest.Builder() .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) @@ -340,7 +341,7 @@ public class NetworkMonitorTest { @Test @SmallTest public void testConnectivityManager_includeOtherUidNetworks_disabled() { - NetworkRequest request = getNetworkRequestForFieldTrials("includeOtherUidNetworks/Disabled"); + NetworkRequest request = getNetworkRequestForFieldTrials("includeOtherUidNetworks:false"); assertTrue(request.equals(new NetworkRequest.Builder() .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .build())); @@ -349,7 +350,7 @@ public class NetworkMonitorTest { @Test @SmallTest public void testConnectivityManager_includeOtherUidNetworks_enabled() { - NetworkRequest request = getNetworkRequestForFieldTrials("includeOtherUidNetworks/Enabled"); + NetworkRequest request = getNetworkRequestForFieldTrials("includeOtherUidNetworks:true"); NetworkRequest.Builder builder = new NetworkRequest.Builder().addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {