commit e86790c8381aceb1d627c878fc41ab765c4d6874
author Jason Monk <jmonk@google.com> Mon May 05 12:36:10 2014 -0400
committer Jason Monk <jmonk@google.com> Mon May 05 12:36:10 2014 -0400
tree ff035a72ce2855502de8d37fe919ec0da54da1d0
parent a0ceb908bfe6d030f588455db3f3b42c9931fdea

Support renaming of ProxyProperties to ProxyInfo

Change-Id: I60621a7155ac2938a54ff466501db9a1013e621b

src/com/android/settings/ProxySelector.java

diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index 052ea0a..441fdf1 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -28,7 +28,7 @@
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.Proxy;
-import android.net.ProxyProperties;
+import android.net.ProxyInfo;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.Selection;
@@ -149,11 +149,11 @@
         ConnectivityManager cm =
                 (ConnectivityManager)getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
 
-        ProxyProperties proxy = cm.getGlobalProxy();
+        ProxyInfo proxy = cm.getGlobalProxy();
         if (proxy != null) {
             hostname = proxy.getHost();
             port = proxy.getPort();
-            exclList = proxy.getExclusionList();
+            exclList = proxy.getExclusionListAsList();
         }
 
         if (hostname == null) {
@@ -229,7 +229,7 @@
                 return false;
             }
         }
-        ProxyProperties p = new ProxyProperties(hostname, port, exclList);
+        ProxyInfo p = new ProxyInfo(hostname, port, exclList);
         // FIXME: The best solution would be to make a better UI that would
         // disable editing of the text boxes if the user chooses to use the
         // default settings. i.e. checking a box to always use the default

src/com/android/settings/wifi/WifiConfigController.java

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 8dc5c91..a54c1c4 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -24,7 +24,7 @@
 import android.net.LinkProperties;
 import android.net.NetworkInfo.DetailedState;
 import android.net.NetworkUtils;
-import android.net.ProxyProperties;
+import android.net.ProxyInfo;
 import android.net.RouteInfo;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiConfiguration.AuthAlgorithm;
@@ -483,7 +483,7 @@
                 result = R.string.proxy_error_invalid_port;
             }
             if (result == 0) {
-                ProxyProperties proxyProperties= new ProxyProperties(host, port, exclusionList);
+                ProxyInfo proxyProperties= new ProxyInfo(host, port, exclusionList);
                 mLinkProperties.setHttpProxy(proxyProperties);
             } else {
                 return false;
@@ -822,11 +822,11 @@
                 mProxyExclusionListView.addTextChangedListener(this);
             }
             if (config != null) {
-                ProxyProperties proxyProperties = config.linkProperties.getHttpProxy();
+                ProxyInfo proxyProperties = config.linkProperties.getHttpProxy();
                 if (proxyProperties != null) {
                     mProxyHostView.setText(proxyProperties.getHost());
                     mProxyPortView.setText(Integer.toString(proxyProperties.getPort()));
-                    mProxyExclusionListView.setText(proxyProperties.getExclusionList());
+                    mProxyExclusionListView.setText(proxyProperties.getExclusionListAsString());
                 }
             }
         } else {