summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2020-01-08 10:25:08 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-01-08 10:25:08 +0000
commitbde15c3c9ac9ed4ab3c12a7873ce3aa4f8fbc907 (patch)
tree652b2511bbeed8111052ffde673f5f22b5b53493
parentba9707e90d6dc11e9ee1c54ad31f4e83c3e9fef2 (diff)
parentc1af050435ab1e3c8c4a50417568725c93d1a0a9 (diff)
Merge "Expose clearCapabilities for mainline module"
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/net/NetworkRequest.java3
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 36567ecc1a72..51641f23a49e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29481,6 +29481,7 @@ package android.net {
method public android.net.NetworkRequest.Builder addCapability(int);
method public android.net.NetworkRequest.Builder addTransportType(int);
method public android.net.NetworkRequest build();
+ method @NonNull public android.net.NetworkRequest.Builder clearCapabilities();
method public android.net.NetworkRequest.Builder removeCapability(int);
method public android.net.NetworkRequest.Builder removeTransportType(int);
method public android.net.NetworkRequest.Builder setNetworkSpecifier(String);
diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java
index 431773dc2622..9731f3ca186d 100644
--- a/core/java/android/net/NetworkRequest.java
+++ b/core/java/android/net/NetworkRequest.java
@@ -247,9 +247,8 @@ public class NetworkRequest implements Parcelable {
* removing even the capabilities that are set by default when the object is constructed.
*
* @return The builder to facilitate chaining.
- * @hide
*/
- @UnsupportedAppUsage
+ @NonNull
public Builder clearCapabilities() {
mNetworkCapabilities.clearAll();
return this;