Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev

This commit is contained in:
Hugo Benichi 2017-08-18 11:46:22 +00:00 • committed by Android (Google) Code Review
commit 3f04e31eee

View file

@ -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);