Merge "Make addUnwantedCapability method public" into pi-dev
diff --git a/api/current.txt b/api/current.txt
index 1598676..e2ba28a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27264,6 +27264,7 @@
ctor public NetworkRequest.Builder();
method public android.net.NetworkRequest.Builder addCapability(int);
method public android.net.NetworkRequest.Builder addTransportType(int);
+ method public android.net.NetworkRequest.Builder addUnwantedCapability(int);
method public android.net.NetworkRequest build();
method public android.net.NetworkRequest.Builder removeCapability(int);
method public android.net.NetworkRequest.Builder removeTransportType(int);
diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java
index caefd89..3d9d6e2 100644
--- a/core/java/android/net/NetworkRequest.java
+++ b/core/java/android/net/NetworkRequest.java
@@ -231,7 +231,6 @@
*
* @param capability The capability to add to unwanted capability list.
* @return The builder to facilitate chaining.
- * @hide
*/
public Builder addUnwantedCapability(@NetworkCapabilities.NetCapability int capability) {
mNetworkCapabilities.addUnwantedCapability(capability);