am 2ffc9ec3: Ensure we dismiss the <select> option dialog.

* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003': Ensure we dismiss the <select> option dialog.
2011-11-28 10:33:48 -08:00
parent b567c41b00 2ffc9ec3d6
commit b11387a6e5
1 changed files with 10 additions and 0 deletions
--- 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();
        }
    }