Merge "Add hasUnwantedCapability method" into pi-dev

am: 3d735d02d6

Change-Id: I7feec81a3f1525055030ee16f34b8e7251e79b9b
This commit is contained in:
Pavel Maltsev
2018-04-04 10:15:10 -07:00
committed by android-build-merger

View File

@@ -172,6 +172,8 @@ public class NetworkRequest implements Parcelable {
* If the given capability was previously added to the list of unwanted capabilities * 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. * then the capability will also be removed from the list of unwanted capabilities.
* *
* @see #addUnwantedCapability(int)
*
* @param capability The capability to add. * @param capability The capability to add.
* @return The builder to facilitate chaining * @return The builder to facilitate chaining
* {@code builder.addCapability(...).addCapability();}. * {@code builder.addCapability(...).addCapability();}.
@@ -435,6 +437,13 @@ public class NetworkRequest implements Parcelable {
return networkCapabilities.hasCapability(capability); return networkCapabilities.hasCapability(capability);
} }
/**
* @see Builder#addUnwantedCapability(int)
*/
public boolean hasUnwantedCapability(@NetCapability int capability) {
return networkCapabilities.hasUnwantedCapability(capability);
}
/** /**
* @see Builder#addTransportType(int) * @see Builder#addTransportType(int)
*/ */