Move Proxy out of framework-connectivity
Proxy is tied to PacProxySelector and IProxyService, which does not have
a formal API. Move it out of framework-connectivity as modularizing it
does not bring much value.
Bug: 171540887
Test: m
Change-Id: I8ceba961a81661c3e11d8179955b594d3cab6ff7
diff --git a/30/public/api/framework-connectivity.txt b/30/public/api/framework-connectivity.txt
index d4262a8..4bfcda3 100644
--- a/30/public/api/framework-connectivity.txt
+++ b/30/public/api/framework-connectivity.txt
@@ -400,16 +400,6 @@
method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);
}
- public final class Proxy {
- ctor public Proxy();
- method @Deprecated public static String getDefaultHost();
- method @Deprecated public static int getDefaultPort();
- method @Deprecated public static String getHost(android.content.Context);
- method @Deprecated public static int getPort(android.content.Context);
- field @Deprecated public static final String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO";
- field public static final String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE";
- }
-
public class ProxyInfo implements android.os.Parcelable {
ctor public ProxyInfo(@Nullable android.net.ProxyInfo);
method public static android.net.ProxyInfo buildDirectProxy(String, int);
diff --git a/31/public/api/incompatibilities.txt b/31/public/api/incompatibilities.txt
index 8fabbb4..4c1058b 100644
--- a/31/public/api/incompatibilities.txt
+++ b/31/public/api/incompatibilities.txt
@@ -25,8 +25,6 @@
Removed class android.net.NetworkCapabilities
RemovedClass: android.net.NetworkRequest:
Removed class android.net.NetworkRequest
-RemovedClass: android.net.Proxy:
- Removed class android.net.Proxy
RemovedClass: android.net.ProxyInfo:
Removed class android.net.ProxyInfo
RemovedClass: android.net.RouteInfo: