Fix menu and popup race conditions on Android

* java/org/gnu/emacs/EmacsActivity.java (onContextMenuClosed):
* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu)
(onMenuItemClick, run):
* java/org/gnu/emacs/EmacsDialog.java (EmacsDialog, onClick)
(createDialog, onDismiss): Take menu event serial, and pass it
along in context menu events.
* java/org/gnu/emacs/EmacsNative.java (sendContextMenu): New
argument.
* src/android.c (sendContextMenu): Pass serial number in event.

* src/androidgui.h (struct android_menu_event): New field
`menu_event_serial'.
* src/androidmenu.c (FIND_METHOD_STATIC)
(android_init_emacs_context_menu): Adjust method declarations.
(android_menu_show, android_dialog_show):
* src/androidterm.c (handle_one_android_event): Expect serial in
context menu events.
* src/androidterm.h: Update prototypes.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/androidterm.c b/src/androidterm.c
index b502b1c6de5..2e2bf86706c 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -1457,7 +1457,12 @@ handle_one_android_event (struct android_display_info *dpyinfo,
       /* Context menu handling.  */
     case ANDROID_CONTEXT_MENU:
 
-      if (dpyinfo->menu_event_id == -1)
+      if (dpyinfo->menu_event_id == -1
+          /* Previously displayed popup menus might generate events
+             after dismissal, which might interfere.
+             `current_menu_serial' is always set to an identifier
+             identifying the last context menu to be displayed.  */
+          && event->menu.menu_event_serial == current_menu_serial)
         dpyinfo->menu_event_id = event->menu.menu_event_id;
 
       goto OTHER;