Skip to content

Commit 2ffc9ec

Browse files
author
Ben Murdoch
committed
Ensure we dismiss the <select> option dialog.
When the WebView is paused, or another action (such as navigating to a new URL) occurs, cancel any ongoing <select> tag dialog that is open. Bug: 5666545 Change-Id: Ifc35a239b729ed93cbf82b2096334f7d63f8993d
1 parent e35581a commit 2ffc9ec

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

core/java/android/webkit/WebView.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,6 +1628,14 @@ private void clearHelpers() {
16281628
clearTextEntry();
16291629
clearActionModes();
16301630
dismissFullScreenMode();
1631+
cancelSelectDialog();
1632+
}
1633+
1634+
private void cancelSelectDialog() {
1635+
if (mListBoxDialog != null) {
1636+
mListBoxDialog.cancel();
1637+
mListBoxDialog = null;
1638+
}
16311639
}
16321640

16331641
/**
@@ -3279,6 +3287,8 @@ public void onPause() {
32793287
if (mNativeClass != 0) {
32803288
nativeSetPauseDrawing(mNativeClass, true);
32813289
}
3290+
3291+
cancelSelectDialog();
32823292
}
32833293
}
32843294

0 commit comments

Comments
 (0)