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

Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b am: 461f4eb099 am: beae621102

Browse Source 
am: c61e1cca85

Change-Id: Icd8e328e3c810a644bfb83798bd42fed8dc70425
This commit is contained in:
Hugo Benichi
2017-08-18 12:36:31 +00:00
committed by android-build-merger
parent c5b37d1bcf c61e1cca85
commit 9d07138891
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.