From 67d3dfd9681d8a3307e19a947e110ce60d7e25cb Mon Sep 17 00:00:00 2001 From: Pavel Maltsev Date: Mon, 2 Apr 2018 11:10:13 -0700 Subject: [PATCH] Add hasUnwantedCapability method If you put values into the Builder, you should be able to observe those values on the built object. Test: atest android.net.cts.NetworkRequestTest Bug: 74945408 Bug: 72828388 Change-Id: Ib4026b8d7370d570f1b606f0d221d00fed6e787d --- api/current.txt | 1 + core/java/android/net/NetworkRequest.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/api/current.txt b/api/current.txt index e2ba28af16780..d3aed11bad964 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27256,6 +27256,7 @@ package android.net { method public int describeContents(); method public boolean hasCapability(int); method public boolean hasTransport(int); + method public boolean hasUnwantedCapability(int); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; } diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java index 3d9d6e29b5399..82af5d3c135f6 100644 --- a/core/java/android/net/NetworkRequest.java +++ b/core/java/android/net/NetworkRequest.java @@ -172,6 +172,8 @@ public class NetworkRequest implements Parcelable { * If the given capability was previously added to the list of unwanted capabilities * then the capability will also be removed from the list of unwanted capabilities. * + * @see #addUnwantedCapability(int) + * * @param capability The capability to add. * @return The builder to facilitate chaining * {@code builder.addCapability(...).addCapability();}. @@ -435,6 +437,13 @@ public class NetworkRequest implements Parcelable { return networkCapabilities.hasCapability(capability); } + /** + * @see Builder#addUnwantedCapability(int) + */ + public boolean hasUnwantedCapability(@NetCapability int capability) { + return networkCapabilities.hasUnwantedCapability(capability); + } + /** * @see Builder#addTransportType(int) */