Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a comment" am: ad0be320e2

Browse Source 
am: c67f43f80c

Change-Id: I6e386d13610c182b2bddee8da16915ed27a3efe6
This commit is contained in:
Chalard Jean
2019-05-30 09:29:36 -07:00
committed by android-build-merger
parent c1a694dddd c67f43f80c
commit 886ba083e7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -963,10 +963,11 @@ public class Vpn {
// VPN either provide a default route (IPv4 or IPv6 or both), or they are a split tunnel
// that falls back to the default network, which by definition provides INTERNET (unless
// there is no default network, in which case none of this matters in any sense).
// Also, it guarantees that when a VPN applies to an app, the VPN will always be reported
// as the network by getDefaultNetwork and registerDefaultNetworkCallback. This in turn
// protects the invariant that apps calling CM#bindProcessToNetwork(getDefaultNetwork())
// the same as if they use the default network.
// Also, always setting the INTERNET bit guarantees that when a VPN applies to an app,
// the VPN will always be reported as the network by getDefaultNetwork and callbacks
// registered with registerDefaultNetworkCallback. This in turn protects the invariant
// that an app calling ConnectivityManager#bindProcessToNetwork(getDefaultNetwork())
// behaves the same as when it uses the default network.
mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
mNetworkInfo.setDetailedState(DetailedState.CONNECTING, null, null);