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

Merge "Unify behavior of various cases of "no underlying networks"" into pi-dev

Browse Source 
am: 468fdc3dd2

Change-Id: I22f80a6a39d4a19ff74aa61fcbd66f1a041b1003
This commit is contained in:
Chalard Jean
2018-05-22 05:19:52 -07:00
committed by android-build-merger
parent 9eee2c33d4 f90bb339f5
commit 8edc5b4398
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();