Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"

am: b35719a057 Change-Id: I0ab76de59e87c46a6961229399ff7200bce49838
2017-08-16 11:50:55 +00:00
parent 9e59475003 1ebf219ed9
commit eea3a77efc
2 changed files with 7 additions and 4 deletions
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -770,7 +770,6 @@ public final class NetworkCapabilities implements Parcelable {

        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
        // TODO: properly support NOT_METERED as a mutable and requestable capability.
        final long mask = ~MUTABLE_CAPABILITIES & ~(1 << NET_CAPABILITY_NOT_METERED);