LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unify behavior of various cases of "no underlying networks"

Browse Source 
Before this change, VPNs having no underlying networks would be
marked as metered as the safe option, but VPNs having only
disconnected underlying networks would be marked as unmetered.
Fix this discrepancy.

Bug: 79748782
Test: runtest frameworks-net
Change-Id: I51c3badde29f43f692f383553bd98327d2da8dd1
This commit is contained in:
Chalard Jean
2018-05-21 15:30:56 +09:00
parent d4f01cadc0
commit f90bb339f5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -4413,13 +4413,11 @@ public class ConnectivityServiceTest {
&& caps.hasCapability(NET_CAPABILITY_NOT_METERED), && caps.hasCapability(NET_CAPABILITY_NOT_METERED),
vpnNetworkAgent); vpnNetworkAgent);
// Disconnect wifi too. No underlying networks should mean this is now metered, // Disconnect wifi too. No underlying networks means this is now metered.
// unfortunately a discrepancy in the current implementation has this unmetered.
// TODO : fix this.
mWiFiNetworkAgent.disconnect(); mWiFiNetworkAgent.disconnect();
vpnNetworkCallback.expectCapabilitiesLike((caps) -> caps.hasTransport(TRANSPORT_VPN) vpnNetworkCallback.expectCapabilitiesLike((caps) -> caps.hasTransport(TRANSPORT_VPN)
&& !caps.hasTransport(TRANSPORT_CELLULAR) && !caps.hasTransport(TRANSPORT_WIFI) && !caps.hasTransport(TRANSPORT_CELLULAR) && !caps.hasTransport(TRANSPORT_WIFI)
&& caps.hasCapability(NET_CAPABILITY_NOT_METERED), && !caps.hasCapability(NET_CAPABILITY_NOT_METERED),
vpnNetworkAgent); vpnNetworkAgent);
mMockVpn.disconnect(); mMockVpn.disconnect();