diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2018-04-24 14:50:14 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-24 14:50:14 -0700 |
| commit | 4d121ff87fe751cfee783886a63f595d2f34b47c (patch) | |
| tree | e2a444a3ed33570d88a419cbd9d367abdad30318 | |
| parent | b46011b3b04ecdfeed49afc14ed9cc39bc562c9e (diff) | |
| parent | dc86aaa112944431972c3def90439e93879ef748 (diff) | |
Merge "Actually @hide unwanted capability methods." into pi-dev am: a09c06a6c1
am: dc86aaa112
Change-Id: I923e5377a1abe761217612452cbfdba752e53de2
| -rw-r--r-- | api/removed.txt | 8 | ||||
| -rw-r--r-- | core/java/android/net/NetworkRequest.java | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/api/removed.txt b/api/removed.txt index 3649ab216168..b6dabcd8614b 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -326,14 +326,6 @@ package android.net { public static abstract class NetworkBadging.Badging implements java.lang.annotation.Annotation { } - public class NetworkRequest implements android.os.Parcelable { - method public boolean hasUnwantedCapability(int); - } - - public static class NetworkRequest.Builder { - method public android.net.NetworkRequest.Builder addUnwantedCapability(int); - } - public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory { method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache); } diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java index bd4a27c2abf2..227a4cb2c516 100644 --- a/core/java/android/net/NetworkRequest.java +++ b/core/java/android/net/NetworkRequest.java @@ -228,7 +228,7 @@ public class NetworkRequest implements Parcelable { * @param capability The capability to add to unwanted capability list. * @return The builder to facilitate chaining. * - * @removed + * @hide */ public Builder addUnwantedCapability(@NetworkCapabilities.NetCapability int capability) { mNetworkCapabilities.addUnwantedCapability(capability); @@ -436,7 +436,7 @@ public class NetworkRequest implements Parcelable { /** * @see Builder#addUnwantedCapability(int) * - * @removed + * @hide */ public boolean hasUnwantedCapability(@NetCapability int capability) { return networkCapabilities.hasUnwantedCapability(capability); |