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

Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b am: 46a7508229 am: 886144c1ff am: 77efec92fe

Browse Source 
am: 0638f10802

Change-Id: Ib9c41ce615a249cd41ec6221dddb0b1c93114568
This commit is contained in:
Hugo Benichi
2017-08-18 12:47:49 +00:00
committed by android-build-merger
parent 2d5491fe5d 0638f10802
commit cf65ae9d57
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4583,8 +4583,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void updateCapabilities( private void updateCapabilities(
int oldScore, NetworkAgentInfo nai, NetworkCapabilities networkCapabilities) { int oldScore, NetworkAgentInfo nai, NetworkCapabilities networkCapabilities) {
// Once a NetworkAgent is connected, complain if some immutable capabilities are removed. // Once a NetworkAgent is connected, complain if some immutable capabilities are removed.
if (nai.everConnected && if (nai.everConnected && !nai.networkCapabilities.satisfiedByImmutableNetworkCapabilities(
!nai.networkCapabilities.satisfiedByNetworkCapabilities(networkCapabilities)) { networkCapabilities)) {
// TODO: consider not complaining when a network agent degrade its capabilities if this // TODO: consider not complaining when a network agent degrade 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
// stop being matched by the updated agent. // stop being matched by the updated agent.