summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2020-01-08 11:08:10 +0800
committer Chiachang Wang <chiachangwang@google.com> 2020-01-08 11:08:10 +0800
commitc1af050435ab1e3c8c4a50417568725c93d1a0a9 (patch)
tree780495ccbe09bbd08116373ce22ee7cadb781fde
parentb7af420f03e5987f40783c29f93e624ced4daa5a (diff)
Expose clearCapabilities for mainline module
Support telephony mainline module usage. Bug: 138306002 Test: Build and make api-stubs-docs-update-current-api Change-Id: I0a462da4e87cae2c7d4a9b9a92de061a086c5752
-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 ac69f6fa6b60..d83440b5ef75 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29477,6 +29477,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;