mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 14:50:39 +01:00
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}
This commit is contained in:
parent
e540648079
commit
70a59b6900
2 changed files with 6 additions and 4 deletions
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue