diff options
| author | Victoria Lease <violets@android.com> | 2013-03-05 15:51:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-05 15:51:19 -0800 |
| commit | 263554ae5f51fe1181c0c80123ec7f489e124f1a (patch) | |
| tree | 26e67d1b5a14d99e4de6baa2ffcb8c52ca7e9b33 /core/java/android/webkit/WebViewClassic.java | |
| parent | 8ef243cf861044eec35ee3d8207561251e34c77c (diff) | |
| parent | 7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b (diff) | |
| download | frameworks_base-263554ae5f51fe1181c0c80123ec7f489e124f1a.zip frameworks_base-263554ae5f51fe1181c0c80123ec7f489e124f1a.tar.gz frameworks_base-263554ae5f51fe1181c0c80123ec7f489e124f1a.tar.bz2 | |
am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"
* commit '7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b':
FIX Null Pointer Exception on dialog cancel
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 2 |
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; } }); |