diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 2fc8c6857b75..22cffcc377f2 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -381,7 +381,7 @@ public final class NetworkCapabilities implements Parcelable { /** * Removes (if found) the given capability from this {@code NetworkCapability} instance. * <p> - * Note that this method removes capabilities that was added via {@link #addCapability(int)}, + * Note that this method removes capabilities that were added via {@link #addCapability(int)}, * {@link #addUnwantedCapability(int)} or {@link #setCapabilities(int[], int[])} . * * @param capability the capability to be removed. @@ -470,6 +470,7 @@ public final class NetworkCapabilities implements Parcelable { && ((mUnwantedNetworkCapabilities & (1 << capability)) != 0); } + /** Note this method may result in having the same capability in wanted and unwanted lists. */ private void combineNetCapabilities(NetworkCapabilities nc) { this.mNetworkCapabilities |= nc.mNetworkCapabilities; this.mUnwantedNetworkCapabilities |= nc.mUnwantedNetworkCapabilities; @@ -1131,7 +1132,11 @@ public final class NetworkCapabilities implements Parcelable { } /** - * Combine a set of Capabilities to this one. Useful for coming up with the complete set + * Combine a set of Capabilities to this one. Useful for coming up with the complete set. + * <p> + * Note that this method may break an invariant of having a particular capability in either + * wanted or unwanted lists but never in both. Requests that have the same capability in + * both lists will never be satisfied. * @hide */ public void combineCapabilities(NetworkCapabilities nc) { |