zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix string that will not make field trial parser crash (in debug)

Browse Source 
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 <hta@webrtc.org>
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36370}
This commit is contained in:
Jonas Oreland
2022-03-29 14:13:06 +02:00
committed by WebRTC LUCI CQ
parent 17481fd031
commit ea0f9a0a19
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,9 +193,9 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
} }
private static boolean checkFieldTrial(String fieldTrials, String key, boolean defaultValue) { private static boolean checkFieldTrial(String fieldTrials, String key, boolean defaultValue) {
if (fieldTrials.contains(key + "/Enabled")) { if (fieldTrials.contains(key + ":true")) {
return true; return true;
} else if (fieldTrials.contains(key + "/Disabled")) { } else if (fieldTrials.contains(key + ":false")) {
return false; return false;
} }
return defaultValue; return defaultValue;

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

@ -305,7 +305,7 @@ public class NetworkMonitorTest {
ConnectivityManagerDelegate delegate = new ConnectivityManagerDelegate( ConnectivityManagerDelegate delegate = new ConnectivityManagerDelegate(
(ConnectivityManager) InstrumentationRegistry.getTargetContext().getSystemService( (ConnectivityManager) InstrumentationRegistry.getTargetContext().getSystemService(
Context.CONNECTIVITY_SERVICE), Context.CONNECTIVITY_SERVICE),
availableNetworks, "getAllNetworksFromCache/Enabled/"); availableNetworks, "getAllNetworksFromCache:true");
Network[] networks = delegate.getAllNetworks(); Network[] networks = delegate.getAllNetworks();
assertTrue(networks.length == 0); assertTrue(networks.length == 0);
@ -321,7 +321,8 @@ public class NetworkMonitorTest {
@Test @Test
@SmallTest @SmallTest
public void testConnectivityManager_requestVPN_disabled() { public void testConnectivityManager_requestVPN_disabled() {
NetworkRequest request = getNetworkRequestForFieldTrials("requestVPN/Disabled"); NetworkRequest request =
getNetworkRequestForFieldTrials("anyothertext,requestVPN:false,anyothertext");
assertTrue(request.equals(new NetworkRequest.Builder() assertTrue(request.equals(new NetworkRequest.Builder()
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.build())); .build()));
@ -330,7 +331,7 @@ public class NetworkMonitorTest {
@Test @Test
@SmallTest @SmallTest
public void testConnectivityManager_requestVPN_enabled() { public void testConnectivityManager_requestVPN_enabled() {
NetworkRequest request = getNetworkRequestForFieldTrials("requestVPN/Enabled"); NetworkRequest request = getNetworkRequestForFieldTrials("requestVPN:true");
assertTrue(request.equals(new NetworkRequest.Builder() assertTrue(request.equals(new NetworkRequest.Builder()
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
@ -340,7 +341,7 @@ public class NetworkMonitorTest {
@Test @Test
@SmallTest @SmallTest
public void testConnectivityManager_includeOtherUidNetworks_disabled() { public void testConnectivityManager_includeOtherUidNetworks_disabled() {
NetworkRequest request = getNetworkRequestForFieldTrials("includeOtherUidNetworks/Disabled"); NetworkRequest request = getNetworkRequestForFieldTrials("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()));
@ -349,7 +350,7 @@ public class NetworkMonitorTest {
@Test @Test
@SmallTest @SmallTest
public void testConnectivityManager_includeOtherUidNetworks_enabled() { public void testConnectivityManager_includeOtherUidNetworks_enabled() {
NetworkRequest request = getNetworkRequestForFieldTrials("includeOtherUidNetworks/Enabled"); NetworkRequest request = getNetworkRequestForFieldTrials("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) {