commit 7f5670fdcdafd06920edc67b81039395da547fcb
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 02 15:07:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 02 15:07:25 2018 +0000
tree d732425bfc8df722c73750e5b60cc89a4a7e5da5
parent ffe1c2a266f5b4f2da93bdf0fadc3f40d74329d0
parent 312c1c2b5fb3864c288133834ff691d576340a60

Merge "Make addUnwantedCapability method public" into pi-dev

api/current.txt

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);

core/java/android/net/NetworkRequest.java

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);