summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2012-09-05 15:04:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-05 15:04:07 -0700
commit18e876806718e28edaa3cd9bb0262a9b400bc82b (patch)
tree8a3a3f26b05ff00f647f3cac574d1276cc95c409 /core/java
parent6d617c2ddd848985fb98e0e54dc7f6234d814b7c (diff)
parentd773ca8ff2a7a5be94d7f2aaa8ff5ef5dac501a8 (diff)
downloadframeworks_base-18e876806718e28edaa3cd9bb0262a9b400bc82b.zip
frameworks_base-18e876806718e28edaa3cd9bb0262a9b400bc82b.tar.gz
frameworks_base-18e876806718e28edaa3cd9bb0262a9b400bc82b.tar.bz2
Merge "remove defunct javascript interface" into jb-mr1-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/BrowserFrame.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
index 1b23b18..6074a0c 100644
--- a/core/java/android/webkit/BrowserFrame.java
+++ b/core/java/android/webkit/BrowserFrame.java
@@ -247,7 +247,6 @@ class BrowserFrame extends Handler {
mWebViewCore = w;
mSearchBox = new SearchBoxImpl(mWebViewCore, mCallbackProxy);
- mJavaScriptObjects.put(SearchBoxImpl.JS_INTERFACE_NAME, mSearchBox);
AssetManager am = context.getAssets();
nativeCreateFrame(w, am, proxy.getBackForwardList());
@@ -598,8 +597,6 @@ class BrowserFrame extends Handler {
}
}
mRemovedJavaScriptObjects.clear();
-
- stringByEvaluatingJavaScriptFromString(SearchBoxImpl.JS_BRIDGE);
}
/**