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

Merge "Motorola request to fix proxy" into honeycomb

Browse Source
This commit is contained in:
Kristian Monsen
2011-01-18 06:05:46 -08:00
committed by Android (Google) Code Review
parent 4b26247e8b 6f6b640950
commit 0664c62c12
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