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

Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: eea3a77efc

Browse Source 
am: 34ea4f9088

Change-Id: I01e287b4df82a53a522566d33b3166f7801badca
This commit is contained in:
Hugo Benichi
2017-08-16 12:14:09 +00:00
committed by android-build-merger
parent deb9ca18aa 34ea4f9088
commit b77d06e971
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/net/NetworkCapabilities.java
View File

@@ -770,7 +770,6 @@ public final class NetworkCapabilities implements Parcelable {
StringJoiner joiner = new StringJoiner(", "); StringJoiner joiner = new StringJoiner(", ");
// TODO: consider only enforcing that capabilities are not removed, allowing addition.
// Ignore NOT_METERED being added or removed as it is effectively dynamic. http://b/63326103 // Ignore NOT_METERED being added or removed as it is effectively dynamic. http://b/63326103
// TODO: properly support NOT_METERED as a mutable and requestable capability. // TODO: properly support NOT_METERED as a mutable and requestable capability.
final long mask = ~MUTABLE_CAPABILITIES & ~(1 << NET_CAPABILITY_NOT_METERED); final long mask = ~MUTABLE_CAPABILITIES & ~(1 << NET_CAPABILITY_NOT_METERED);

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

@@ -4574,11 +4574,15 @@ public class ConnectivityService extends IConnectivityManager.Stub
*/ */
private void updateCapabilities( private void updateCapabilities(
int oldScore, NetworkAgentInfo nai, NetworkCapabilities networkCapabilities) { int oldScore, NetworkAgentInfo nai, NetworkCapabilities networkCapabilities) {
// Sanity check: a NetworkAgent should not change its static capabilities or parameters. // Once a NetworkAgent is connected, complain if some immutable capabilities are removed.
if (nai.everConnected) { if (nai.everConnected &&
!nai.networkCapabilities.satisfiedByNetworkCapabilities(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.
String diff = nai.networkCapabilities.describeImmutableDifferences(networkCapabilities); String diff = nai.networkCapabilities.describeImmutableDifferences(networkCapabilities);
if (!TextUtils.isEmpty(diff)) { if (!TextUtils.isEmpty(diff)) {
Slog.wtf(TAG, "BUG: " + nai + " changed immutable capabilities:" + diff); Slog.wtf(TAG, "BUG: " + nai + " lost immutable capabilities:" + diff);
} }
} }