diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-04-27 13:57:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-27 13:57:12 +0000 |
| commit | d2b8ec4f8628308ab2275c67c4f841273539af84 (patch) | |
| tree | 00f86cd2214a021857cb0e0c455d49cb73768e3e /core/java/android | |
| parent | 39f3d9bb082e486563bee6c1d1c431bfa292d0c8 (diff) | |
| parent | bd446384c891c17894a68b3a7fadafc56969ecdf (diff) | |
Merge "Remove EXTRA_PROXY_INFO." into sc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/Proxy.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java index 77c8a4f4579b..1927e20255e3 100644 --- a/core/java/android/net/Proxy.java +++ b/core/java/android/net/Proxy.java @@ -60,6 +60,7 @@ public final class Proxy { * {@link ConnectivityManager#getDefaultProxy()} or * {@link ConnectivityManager#getLinkProperties(Network)}.{@link LinkProperties#getHttpProxy()} * to get the proxy for the Network(s) they are using. + * @removed */ @Deprecated public static final String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO"; |