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.

2 files changed, 20 insertions, 10 deletions

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 (),
diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index f5e40e9a2d9..68a18ec2aa7 100644
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -1201,16 +1201,25 @@ public final class EmacsWindow extends EmacsHandleObject
   }
 
   public void
-  toggleOnScreenKeyboard (boolean on)
+  toggleOnScreenKeyboard (final boolean on)
   {
-    /* InputMethodManager functions are thread safe.  Call
-       `showOnScreenKeyboard' etc from the Emacs thread in order to
-       keep the calls in sync with updates to the input context.  */
+    /* Even though InputMethodManager functions are thread safe,
+       `showOnScreenKeyboard' etc must be called from the UI thread in
+       order to avoid deadlocks if the calls happen in tandem with a
+       call to a synchronizing function within
+       `onCreateInputConnection'.  */
 
-    if (on)
-      view.showOnScreenKeyboard ();
-    else
-      view.hideOnScreenKeyboard ();
+    EmacsService.SERVICE.runOnUiThread (new Runnable () {
+        @Override
+        public void
+        run ()
+        {
+          if (on)
+            view.showOnScreenKeyboard ();
+          else
+            view.hideOnScreenKeyboard ();         
+        }
+      });
   }
 
   public String