Merge "FIX Null Pointer Exception on dialog cancel"

2013-03-05 23:25:15 +00:00
parent f45efd276c fe6c30e44e
commit 7d4e52baee
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;
                }
            });