From 6fabfa0e323cacfec45922de6813ab7ef40db929 Mon Sep 17 00:00:00 2001
From: Paul Jensen <pauljensen@google.com>
Date: Wed, 11 Mar 2015 11:51:46 -0400
Subject: [PATCH] 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 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 767113e848..099f68dfe3 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1783,7 +1783,6 @@ public class ConnectivityManager {
      *
      * @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();