PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support renaming of ProxyProperties to ProxyInfo

Browse Source 
Change-Id: I60621a7155ac2938a54ff466501db9a1013e621b
This commit is contained in:
Jason Monk
2014-05-05 12:36:10 -04:00
parent a0ceb908bf
commit e86790c838
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -24,7 +24,7 @@ import android.net.LinkAddress;
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 @@ public class WifiConfigController implements TextWatcher,
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 @@ public class WifiConfigController implements TextWatcher,
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 {