Revert "Merge "Send proxy changes on the webcore thread to WebKit""
This reverts commit ea8f4e0d667b1da70960e35f16ed371ffb4ad2ed, reversing
changes made to fd4dda8d77231db01b26686f61601a999a2d96f3.
diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java
index 976e786..908526f 100644
--- a/core/java/android/webkit/JWebCoreJavaBridge.java
+++ b/core/java/android/webkit/JWebCoreJavaBridge.java
@@ -307,5 +307,4 @@
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);
}
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 9718443..885bada 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -48,8 +48,6 @@
import android.graphics.Region;
import android.graphics.Shader;
import android.graphics.drawable.Drawable;
-import android.net.Proxy;
-import android.net.ProxyProperties;
import android.net.Uri;
import android.net.http.SslCertificate;
import android.os.AsyncTask;
@@ -983,7 +981,6 @@
*/
init();
setupPackageListener(context);
- setupProxyListener(context);
updateMultiTouchSupport(context);
if (privateBrowsing) {
@@ -993,42 +990,6 @@
mAutoFillData = new WebViewCore.AutoFillData();
}
- private static class ProxyReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (intent.getAction().equals(Proxy.PROXY_CHANGE_ACTION)) {
- handleProxyBroadcast(intent);
- }
- }
- }
-
- private static void setupProxyListener(Context context) {
- IntentFilter filter = new IntentFilter();
- filter.addAction(Proxy.PROXY_CHANGE_ACTION);
- Intent currentProxy = context.registerReceiver(new ProxyReceiver(), filter);
- if (currentProxy != null) {
- handleProxyBroadcast(currentProxy);
- }
- }
-
- private static void handleProxyBroadcast(Intent intent) {
- ProxyProperties proxyProperties = (ProxyProperties)intent.getExtra(Proxy.EXTRA_PROXY_INFO);
- if (proxyProperties == null) {
- WebViewCore.sendStaticMessage(EventHub.PROXY_CHANGED, "");
- return;
- }
-
- String host = proxyProperties.getHost();
- int port = proxyProperties.getPort();
- 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);
- }
-
/*
* A variable to track if there is a receiver added for ACTION_PACKAGE_ADDED
* or ACTION_PACKAGE_REMOVED.
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 45927f9..f45fad9 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -684,14 +684,6 @@
}
BrowserFrame.sJavaBridge.removePackageName((String) msg.obj);
break;
-
- case EventHub.PROXY_CHANGED:
- if (BrowserFrame.sJavaBridge == null) {
- throw new IllegalStateException(
- "No WebView has been created in this process!");
- }
- BrowserFrame.sJavaBridge.updateProxy((String) msg.obj);
- break;
}
}
};
@@ -991,8 +983,6 @@
static final int AUTOFILL_FORM = 192;
- static final int PROXY_CHANGED = 193;
-
// private message ids
private static final int DESTROY = 200;