diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-28 10:33:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-28 10:33:48 -0800 |
| commit | b11387a6e51c424e421b0951de20db46a5f5c992 (patch) | |
| tree | a6b5758b4f9fc2a9cd3422176eb850b7dc1dfc77 | |
| parent | b567c41b00fd196a2994f3cf8090b8a503c04939 (diff) | |
| parent | 2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003 (diff) | |
| download | frameworks_base-b11387a6e51c424e421b0951de20db46a5f5c992.zip frameworks_base-b11387a6e51c424e421b0951de20db46a5f5c992.tar.gz frameworks_base-b11387a6e51c424e421b0951de20db46a5f5c992.tar.bz2 | |
am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
Ensure we dismiss the <select> option dialog.
| -rw-r--r-- | core/java/android/webkit/WebView.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 877c9ea..9c2e6b8 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1628,6 +1628,14 @@ public class WebView extends AbsoluteLayout clearTextEntry(); clearActionModes(); dismissFullScreenMode(); + cancelSelectDialog(); + } + + private void cancelSelectDialog() { + if (mListBoxDialog != null) { + mListBoxDialog.cancel(); + mListBoxDialog = null; + } } /** @@ -3279,6 +3287,8 @@ public class WebView extends AbsoluteLayout if (mNativeClass != 0) { nativeSetPauseDrawing(mNativeClass, true); } + + cancelSelectDialog(); } } |