LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix parsing of global:http_proxy value."

Browse Source
This commit is contained in:
Andreas Huber
2013-05-28 23:06:30 +00:00
committed by Android (Google) Code Review
parent 5f15365229 23bff230fc
commit 61f11e1fd1
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/ConnectivityService.java
View File

@@ -3134,6 +3134,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
Settings.Global.HTTP_PROXY); Settings.Global.HTTP_PROXY);
if (!TextUtils.isEmpty(proxy)) { if (!TextUtils.isEmpty(proxy)) {
String data[] = proxy.split(":"); String data[] = proxy.split(":");
if (data.length == 0) {
return;
}
String proxyHost = data[0]; String proxyHost = data[0];
int proxyPort = 8080; int proxyPort = 8080;
if (data.length > 1) { if (data.length > 1) {
@@ -3145,6 +3149,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
ProxyProperties p = new ProxyProperties(data[0], proxyPort, ""); ProxyProperties p = new ProxyProperties(data[0], proxyPort, "");
setGlobalProxy(p); setGlobalProxy(p);
} else {
setGlobalProxy(null);
} }
} }