summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebViewClassic.java
diff options
context:
space:
mode:
authorVictoria Lease <violets@android.com>2013-03-05 23:53:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-05 23:53:48 +0000
commit913f3c8f17ddfcfe67b8deb054272da29b6cdd6d (patch)
tree7a6fa9e98b26abd8cb52201104917db39aff23c7 /core/java/android/webkit/WebViewClassic.java
parentb2f91e7b23031496082f4dc1f5f0efdbc22188ea (diff)
parent263554ae5f51fe1181c0c80123ec7f489e124f1a (diff)
downloadframeworks_base-913f3c8f17ddfcfe67b8deb054272da29b6cdd6d.zip
frameworks_base-913f3c8f17ddfcfe67b8deb054272da29b6cdd6d.tar.gz
frameworks_base-913f3c8f17ddfcfe67b8deb054272da29b6cdd6d.tar.bz2
am 263554ae: am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"
* commit '263554ae5f51fe1181c0c80123ec7f489e124f1a': FIX Null Pointer Exception on dialog cancel
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
-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 6fefcca..67041ac 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;
}
});