diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/net/Network.java | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 2833c9c..35e682a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17147,6 +17147,7 @@ package android.net { method public java.net.InetAddress getByName(java.lang.String) throws java.net.UnknownHostException; method public javax.net.SocketFactory getSocketFactory(); method public java.net.URLConnection openConnection(java.net.URL) throws java.io.IOException; + method public java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) throws java.io.IOException; method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.Network> CREATOR; } diff --git a/api/system-current.txt b/api/system-current.txt index 2f94e65..d86efb9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -18408,6 +18408,7 @@ package android.net { method public java.net.InetAddress getByName(java.lang.String) throws java.net.UnknownHostException; method public javax.net.SocketFactory getSocketFactory(); method public java.net.URLConnection openConnection(java.net.URL) throws java.io.IOException; + method public java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) throws java.io.IOException; method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.Network> CREATOR; } diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index df6eb99..39db41d 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -275,7 +275,6 @@ public class Network implements Parcelable { * @throws IllegalArgumentException if the argument proxy is null. * @throws IOException if an error occurs while opening the connection. * @see java.net.URL#openConnection() - * @hide */ public URLConnection openConnection(URL url, java.net.Proxy proxy) throws IOException { if (proxy == null) throw new IllegalArgumentException("proxy is null"); |