am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"

* commit '7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b': FIX Null Pointer Exception on dialog cancel
2013-03-05 15:51:19 -08:00
parent 8ef243cf86 7d4e52baee
commit 263554ae5f
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -8368,8 +8368,10 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
            mListBoxDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
                @Override
                public void onCancel(DialogInterface dialog) {
+                 if (mWebViewCore != null) {
                    mWebViewCore.sendMessage(
                                EventHub.SINGLE_LISTBOX_CHOICE, -2, 0);
+                    }
                    mListBoxDialog = null;
                }
            });