summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
diff options
context:
space:
mode:
authorVictoria Lease <violets@android.com>2013-03-05 23:25:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-03-05 23:25:16 +0000
commit7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b (patch)
tree8bcf3f23c9bb2550abcda6064ef3260e9538ccfe /core/java/android/webkit
parentf45efd276c9b09adcb97ea43afc806731583aac7 (diff)
parentfe6c30e44e706cfd8f2c359d394a1dbe16d1b80f (diff)
downloadframeworks_base-7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b.zip
frameworks_base-7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b.tar.gz
frameworks_base-7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b.tar.bz2
Merge "FIX Null Pointer Exception on dialog cancel"
Diffstat (limited to 'core/java/android/webkit')
-rw-r--r--core/java/android/webkit/WebViewClassic.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 7154f95..0024fd3 100644
--- 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;
}
});