Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused setHttpProxy."

Browse Source
This commit is contained in:
Robert Greenwalt
2011-07-08 11:06:55 -07:00
committed by Android (Google) Code Review
parent 6dabb63307 2bfa2e65f4
commit 532fee45e2
1 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java
View File

@@ -76,8 +76,6 @@ public class GsmDataConnection extends DataConnection {
+ "' APN: '" + mApn.apn
+ "' proxy: '" + mApn.proxy + "' port: '" + mApn.port);
setHttpProxy (mApn.proxy, mApn.port);
createTime = -1;
lastFailTime = -1;
lastFailCause = FailCause.NONE;
@@ -152,38 +150,6 @@ public class GsmDataConnection extends DataConnection {
Log.d(LOG_TAG, "[" + getName() + "] " + s);
}
private void setHttpProxy(String httpProxy, String httpPort) {
if (DBG) log("set http proxy for"
+ "' APN: '" + mActiveApnType
+ "' proxy: '" + mApn.proxy + "' port: '" + mApn.port);
if(TextUtils.equals(mActiveApnType, Phone.APN_TYPE_DEFAULT)) {
if (httpProxy == null || httpProxy.length() == 0) {
phone.setSystemProperty("net.gprs.http-proxy", null);
return;
}
if (httpPort == null || httpPort.length() == 0) {
httpPort = "8080"; // Default to port 8080
}
phone.setSystemProperty("net.gprs.http-proxy",
"http://" + httpProxy + ":" + httpPort + "/");
} else {
if (httpProxy == null || httpProxy.length() == 0) {
phone.setSystemProperty("net.gprs.http-proxy." + mActiveApnType, null);
return;
}
if (httpPort == null || httpPort.length() == 0) {
httpPort = "8080"; // Default to port 8080
}
phone.setSystemProperty("net.gprs.http-proxy." + mActiveApnType,
"http://" + httpProxy + ":" + httpPort + "/");
}
}
private boolean isIpAddress(String address) {
if (address == null) return false;