diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-03-02 15:24:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-02 15:24:58 -0800 |
| commit | 7fb34b29c60572152d58c6afc037461e8b0913c7 (patch) | |
| tree | 259915c3ca85ffbaeeaa1a65e98d736f2b28c164 /core | |
| parent | 1254169260954c72eefa5fd99a9b2bd9de44efa1 (diff) | |
| parent | fa44314d3afda1797f48321c7daaf999fc8677bf (diff) | |
| download | frameworks_base-7fb34b29c60572152d58c6afc037461e8b0913c7.zip frameworks_base-7fb34b29c60572152d58c6afc037461e8b0913c7.tar.gz frameworks_base-7fb34b29c60572152d58c6afc037461e8b0913c7.tar.bz2 | |
Merge "Force close in WebView."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 43f8790..af20ddb 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -3666,9 +3666,11 @@ public class WebView extends AbsoluteLayout * @param interfaceName The name of the interface to remove. */ public void removeJavascriptInterface(String interfaceName) { - WebViewCore.JSInterfaceData arg = new WebViewCore.JSInterfaceData(); - arg.mInterfaceName = interfaceName; - mWebViewCore.sendMessage(EventHub.REMOVE_JS_INTERFACE, arg); + if (mWebViewCore != null) { + WebViewCore.JSInterfaceData arg = new WebViewCore.JSInterfaceData(); + arg.mInterfaceName = interfaceName; + mWebViewCore.sendMessage(EventHub.REMOVE_JS_INTERFACE, arg); + } } /** |