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

Merge "Don't complain if a VPN changes capabilities." into pi-dev

Browse Source 
am: c58ef904d5

Change-Id: I26d2e1526c21ad2bac369a565b06155780190692
This commit is contained in:
Lorenzo Colitti
2018-05-31 10:41:34 -07:00
committed by android-build-merger
parent 70d1f47f7d c58ef904d5
commit 1b0ae341f8
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -4868,7 +4868,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
*/ */
private NetworkCapabilities mixInCapabilities(NetworkAgentInfo nai, NetworkCapabilities nc) { private NetworkCapabilities mixInCapabilities(NetworkAgentInfo nai, NetworkCapabilities nc) {
// Once a NetworkAgent is connected, complain if some immutable capabilities are removed. // Once a NetworkAgent is connected, complain if some immutable capabilities are removed.
// Don't complain for VPNs since they're not driven by requests and there is no risk of
// causing a connect/teardown loop.
// TODO: remove this altogether and make it the responsibility of the NetworkFactories to
// avoid connect/teardown loops.
if (nai.everConnected && if (nai.everConnected &&
!nai.isVPN() &&
!nai.networkCapabilities.satisfiedByImmutableNetworkCapabilities(nc)) { !nai.networkCapabilities.satisfiedByImmutableNetworkCapabilities(nc)) {
// TODO: consider not complaining when a network agent degrades its capabilities if this // TODO: consider not complaining when a network agent degrades its capabilities if this
// does not cause any request (that is not a listen) currently matching that agent to // does not cause any request (that is not a listen) currently matching that agent to