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

am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev

Browse Source 
* commit 'a22000d244915df2098619be5fd66bf1c4d019c8':
  DO NOT MERGE remove defunct javascript interface
This commit is contained in:
Geremy Condra
2012-10-09 21:34:33 -07:00
committed by Android Git Automerger
parent 0c9c8d0a06 a22000d244
commit dadea723a3
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,7 +245,6 @@ class BrowserFrame extends Handler {
mWebViewCore = w; mWebViewCore = w;
mSearchBox = new SearchBoxImpl(mWebViewCore, mCallbackProxy); mSearchBox = new SearchBoxImpl(mWebViewCore, mCallbackProxy);
mJavaScriptObjects.put(SearchBoxImpl.JS_INTERFACE_NAME, mSearchBox);
AssetManager am = context.getAssets(); AssetManager am = context.getAssets();
nativeCreateFrame(w, am, proxy.getBackForwardList()); nativeCreateFrame(w, am, proxy.getBackForwardList());
@@ -598,8 +597,6 @@ class BrowserFrame extends Handler {
} }
} }
mRemovedJavaScriptObjects.clear(); mRemovedJavaScriptObjects.clear();
stringByEvaluatingJavaScriptFromString(SearchBoxImpl.JS_BRIDGE);
} }
/** /**