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

am 0664c62c: Merge "Motorola request to fix proxy" into honeycomb

Browse Source 
* commit '0664c62c12b885d1c5029185623299f73b048f88':
  Motorola request to fix proxy
This commit is contained in:
Kristian Monsen
2011-01-18 08:26:52 -08:00
committed by Android Git Automerger
parent 90f7fd92eb 0664c62c12
commit b3e976fdd9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/WebView.java
View File

@@ -1037,7 +1037,7 @@ public class WebView extends AbsoluteLayout
String host = proxyProperties.getHost(); String host = proxyProperties.getHost();
int port = proxyProperties.getPort(); int port = proxyProperties.getPort();
if (port != 0) if (port != 0)
host += ": " + port; host += ":" + port;
// TODO: Handle exclusion list // TODO: Handle exclusion list
// The plan is to make an AndroidProxyResolver, and handle the blacklist // The plan is to make an AndroidProxyResolver, and handle the blacklist