commit 6fabfa0e323cacfec45922de6813ab7ef40db929
author Paul Jensen <pauljensen@google.com> Wed Mar 11 11:51:46 2015 -0400
committer Paul Jensen <pauljensen@google.com> Fri Apr 03 07:25:55 2015 -0400
tree 3c9ba08fc2d517879007866dac297c221c44528d
parent ee2f45d85f289a7a352e22cd3912cf121ac7aa6e

Deprecate EXTRA_PROXY_INFO and unhide ConnectivityManager.getDefaultProxy().

1. Unhide ConnectivityManager.getDefaultProxy() and update it to
   take into account process-bound-Networks.
2. Deprecate EXTRA_PROXY_INFO and instead encourage querying via
   getDefaultProxy().

Bug: 17905627
Bug: 17420465
Bug: 18144582

Change-Id: I45358ee82fe705d048022c8238b2452f52c37b88

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 767113e..099f68d 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1783,7 +1783,6 @@
      *
      * @return the {@link ProxyInfo} for the current HTTP proxy, or {@code null} if no
      *        HTTP proxy is active.
-     * @hide
      */
     public ProxyInfo getDefaultProxy() {
         final Network network = getBoundNetworkForProcess();