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

Merge "Fix a comment"

Browse Source
This commit is contained in:
Chalard Jean
2019-05-30 14:39:48 +00:00
committed by Gerrit Code Review
parent 3fd64333d2 8a0f055e75
commit ad0be320e2
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 // 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 // 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). // 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 // Also, always setting the INTERNET bit guarantees that when a VPN applies to an app,
// as the network by getDefaultNetwork and registerDefaultNetworkCallback. This in turn // the VPN will always be reported as the network by getDefaultNetwork and callbacks
// protects the invariant that apps calling CM#bindProcessToNetwork(getDefaultNetwork()) // registered with registerDefaultNetworkCallback. This in turn protects the invariant
// the same as if they use the default network. // that an app calling ConnectivityManager#bindProcessToNetwork(getDefaultNetwork())
// behaves the same as when it uses the default network.
mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
mNetworkInfo.setDetailedState(DetailedState.CONNECTING, null, null); mNetworkInfo.setDetailedState(DetailedState.CONNECTING, null, null);