Correct deadlock in Android port

* java/org/gnu/emacs/EmacsService.java (updateCursorAnchorInfo):
Delete extraneous whitespace.
(updateExtractedText): Encase synchronous IM manager operation
in deadlock prevention mechanism.

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index fb123769bdfb6b26dee8850409c0eaffc9466f03..05952f98cf16ed9b28ab1eb4da4c84c563ea4ecf 100644 (file)
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -889,8 +889,6 @@ public final class EmacsService extends Service
                                        0);
     info = builder.build ();
 
-
-
     if (DEBUG_IC)
       Log.d (TAG, ("updateCursorAnchorInfo: " + x + " " + y
                   + " " + yBaseline + "-" + yBottom));
@@ -1142,8 +1140,10 @@ public final class EmacsService extends Service
     if (DEBUG_IC)
       Log.d (TAG, "updateExtractedText: @" + token + ", " + text);
 
+    icBeginSynchronous ();
     window.view.imManager.updateExtractedText (window.view,
                                               token, text);
+    icEndSynchronous ();
   }
 
 \f