diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-03-02 14:54:03 -0800 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2011-03-02 14:54:07 -0800 |
| commit | fa44314d3afda1797f48321c7daaf999fc8677bf (patch) | |
| tree | f41b80564c622d2077450c4ed96a63083f51583d /core | |
| parent | f867706180c0ce374b30769f367df263aaab4e08 (diff) | |
| download | frameworks_base-fa44314d3afda1797f48321c7daaf999fc8677bf.zip frameworks_base-fa44314d3afda1797f48321c7daaf999fc8677bf.tar.gz frameworks_base-fa44314d3afda1797f48321c7daaf999fc8677bf.tar.bz2 | |
Force close in WebView.
bug:3504589
WebView#removeJavascriptInterface was not performing check if
a mWebViewCore instance is present. Added such a check.
Change-Id: I7f6dfe51a08f23dddf2fc94df635fdfa68e9a7cf
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); + } } /** |