diff options
| author | Selim Gurun <sgurun@google.com> | 2012-09-10 18:21:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-10 18:21:14 -0700 |
| commit | 6eb6157da6935e6dbc72ac331431c10709ee824e (patch) | |
| tree | bbaed3ed9efb0689a2657686183b5b66b2de04da /core/java/android/webkit/WebViewClassic.java | |
| parent | a090b7429de190536114d03dd5be887ccdb373c5 (diff) | |
| parent | d2d3bff22c339bc30452a6c79b703b6d22f08d3b (diff) | |
| download | frameworks_base-6eb6157da6935e6dbc72ac331431c10709ee824e.zip frameworks_base-6eb6157da6935e6dbc72ac331431c10709ee824e.tar.gz frameworks_base-6eb6157da6935e6dbc72ac331431c10709ee824e.tar.bz2 | |
am d2d3bff2: am befab9e6: Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev
* commit 'd2d3bff22c339bc30452a6c79b703b6d22f08d3b':
Control access to inherited methods of jsinterface objects
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 97da2a7..9f05f76 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -4114,12 +4114,15 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc */ @Override public void addJavascriptInterface(Object object, String name) { + if (object == null) { return; } WebViewCore.JSInterfaceData arg = new WebViewCore.JSInterfaceData(); + // TODO in a separate CL provide logic to enable annotations for API level JB_MR1 and above. arg.mObject = object; arg.mInterfaceName = name; + arg.mRequireAnnotation = false; mWebViewCore.sendMessage(EventHub.ADD_JS_INTERFACE, arg); } |