From 3b08bb1318cd0bf6bc1811b520f9c6934b1aa3bd Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Mon, 12 Jun 2023 14:19:01 +0800
Subject: Fix deadlocks

* java/org/gnu/emacs/EmacsView.java (EmacsView)
(showOnScreenKeyboard, hideOnScreenKeyboard): Don't synchronize.
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow)
(toggleOnScreenKeyboard): Revert to calling IMM functions from
the main thread.
* src/android.c (struct android_event_container)
(android_pselect_nfds, android_pselect_readfds)
(android_pselect_writefds, android_pselect_exceptfds)
(android_pselect_timeout): Don't make volatile.
(android_wait_event): Run queries if necessary.
---
 java/org/gnu/emacs/EmacsView.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'java/org/gnu/emacs/EmacsView.java')

diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index 7fd672233f2..278c6025902 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -590,16 +590,17 @@ public final class EmacsView extends ViewGroup
     super.onAttachedToWindow ();
   }
 
-  public synchronized void
+  public void
   showOnScreenKeyboard ()
   {
     /* Specifying no flags at all tells the system the user asked for
        the input method to be displayed.  */
+
     imManager.showSoftInput (this, 0);
     isCurrentlyTextEditor = true;
   }
 
-  public synchronized void
+  public void
   hideOnScreenKeyboard ()
   {
     imManager.hideSoftInputFromWindow (this.getWindowToken (),
-- 
cgit v1.3