Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions...

diff --cc core/java/android/app/ActivityThread.java
Simple merge

diff --cc core/java/android/net/ConnectivityManager.java
Simple merge

diff --cc core/java/android/net/IConnectivityManager.aidl
index c1b4a1f,397e47b..89d23a2
--- 1/core/java/android/net/IConnectivityManager.aidl
--- 2/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@@ -104,11 -104,11 +104,11 @@@ interface IConnectivityManage
  
      void setGlobalProxy(in ProxyInfo p);
  
-     ProxyInfo getDefaultProxy();
+     ProxyInfo getProxyForNetwork(in Network nework);
  
 -    boolean prepareVpn(String oldPackage, String newPackage);
 +    boolean prepareVpn(String oldPackage, String newPackage, int userId);
  
 -    void setVpnPackageAuthorization(boolean authorized);
 +    void setVpnPackageAuthorization(String packageName, int userId, boolean authorized);
  
      ParcelFileDescriptor establishVpn(in VpnConfig config);
  

diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge