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

Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2

Browse Source
This commit is contained in:
Kristian Monsen
2011-05-24 11:16:39 -07:00
committed by Android (Google) Code Review
parent 2959916b13 f147b5f2a6
commit 36ac304c6e
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/webkit/JWebCoreJavaBridge.java
View File

@@ -16,6 +16,7 @@
package android.webkit;
import android.net.ProxyProperties;
import android.net.Uri;
import android.os.Handler;
import android.os.Message;
@@ -294,6 +295,20 @@ final class JWebCoreJavaBridge extends Handler {
mContentUriToFilePathMap.put(contentUri, path);
}
public void updateProxy(ProxyProperties proxyProperties) {
if (proxyProperties == null) {
nativeUpdateProxy("", "");
return;
}
String host = proxyProperties.getHost();
int port = proxyProperties.getPort();
if (port != 0)
host += ":" + port;
nativeUpdateProxy(host, proxyProperties.getExclusionList());
}
private native void nativeConstructor();
private native void nativeFinalize();
private native void sharedTimerFired();
@@ -304,5 +319,5 @@ final class JWebCoreJavaBridge extends Handler {
public native void addPackageNames(Set<String> packageNames);
public native void addPackageName(String packageName);
public native void removePackageName(String packageName);
public native void updateProxy(String newProxy);
public native void nativeUpdateProxy(String newProxy, String exclusionList);
}

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

@@ -1045,20 +1045,10 @@ public class WebView extends AbsoluteLayout
private static void handleProxyBroadcast(Intent intent) {
ProxyProperties proxyProperties = (ProxyProperties)intent.getExtra(Proxy.EXTRA_PROXY_INFO);
if (proxyProperties == null || proxyProperties.getHost() == null) {
WebViewCore.sendStaticMessage(EventHub.PROXY_CHANGED, "");
WebViewCore.sendStaticMessage(EventHub.PROXY_CHANGED, null);
return;
}
String host = proxyProperties.getHost();
int port = proxyProperties.getPort();
if (port != 0)
host += ":" + port;
// TODO: Handle exclusion list
// The plan is to make an AndroidProxyResolver, and handle the blacklist
// there
String exclusionList = proxyProperties.getExclusionList();
WebViewCore.sendStaticMessage(EventHub.PROXY_CHANGED, host);
WebViewCore.sendStaticMessage(EventHub.PROXY_CHANGED, proxyProperties);
}
/*

3
core/java/android/webkit/WebViewCore.java
View File

@@ -24,6 +24,7 @@ import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.Region;
import android.media.MediaFile;
import android.net.ProxyProperties;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
@@ -705,7 +706,7 @@ final class WebViewCore {
throw new IllegalStateException(
"No WebView has been created in this process!");
}
BrowserFrame.sJavaBridge.updateProxy((String) msg.obj);
BrowserFrame.sJavaBridge.updateProxy((ProxyProperties)msg.obj);
break;
}
}