AI 144235: Fix for 1752906: clicking "cancel" on a multiple <select> element disables future select elements from working. Add a listener for cancel, which will clear out the old popup, and allow a new one to be brought up in the future.
BUG=1752906
Automated import of CL 144235
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 2bac925..f6ad793 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4890,7 +4890,12 @@
adapter.getCount(), 0,
listView.getCheckedItemPositions());
}});
- b.setNegativeButton(android.R.string.cancel, null);
+ b.setNegativeButton(android.R.string.cancel,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ mWebViewCore.sendMessage(
+ EventHub.SINGLE_LISTBOX_CHOICE, -2, 0);
+ }});
}
final AlertDialog dialog = b.create();
listView.setAdapter(adapter);