| commit | b319377255ddde12135fe3ac53858493290adab0 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Fri Aug 18 14:41:22 2017 +0900 |
| committer | Hugo Benichi <hugobenichi@google.com> | Fri Aug 18 12:44:26 2017 +0000 |
| tree | 958151c40c6078d50841c786aaa220ce8b349dd9 | |
| parent | 3f04e31eee2fda4d37ad37a03aca6bbb25de8b63 [diff] |
Really allow NetworkAgent immutable updates to NetworkCapabilities This patch completes commit bae105a5ccd11430bab14721d1325e2303a673da to really allow updates of immutable capabilities to NetworkCapabilities of NetworkAgents by using satisfiedByImmutableNetworkCapabilities instead satisfiedByNetworkCapabilities. Bug: 64125969 Test: runtest frameworks-net Merged-In: I9beeb623792f0ee31abcd4ba9d0ba2451304fb2e Merged-In: Ifbdd005576b3f0fbf278ecec81ce3e4308c6276d Merged-In: Id352fdb6da21a2150d3e8d062d7eba11878f6919 Merged-In: If3742ea0e2151b9b710eda2fed280c31f7960393 Merged-In: Icd8e328e3c810a644bfb83798bd42fed8dc70425 (cherry picked from commit a60c6eab42cd904faaf26c23100939d397b80c39) Change-Id: I737494117d7f1e0198f0ad4d3c41019c9295fe09
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 5110929..ec83a03 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4583,8 +4583,8 @@ private void updateCapabilities( int oldScore, NetworkAgentInfo nai, NetworkCapabilities networkCapabilities) { // Once a NetworkAgent is connected, complain if some immutable capabilities are removed. - if (nai.everConnected && - !nai.networkCapabilities.satisfiedByNetworkCapabilities(networkCapabilities)) { + if (nai.everConnected && !nai.networkCapabilities.satisfiedByImmutableNetworkCapabilities( + networkCapabilities)) { // 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 // stop being matched by the updated agent.