Merge from savannah/emacs-30

ded77fefffa Fix remaining Android bugs reported over the past months

1 files changed, 10 insertions, 5 deletions

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 5225337a826..babf2626ba5 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -938,11 +938,11 @@ public final class EmacsService extends Service
   }
 
   public void
-  updateCursorAnchorInfo (EmacsWindow window, float x,
+  updateCursorAnchorInfo (final EmacsWindow window, float x,
 			  float y, float yBaseline,
 			  float yBottom)
   {
-    CursorAnchorInfo info;
+    final CursorAnchorInfo info;
     CursorAnchorInfo.Builder builder;
     Matrix matrix;
     int[] offsets;
@@ -964,9 +964,14 @@ public final class EmacsService extends Service
       Log.d (TAG, ("updateCursorAnchorInfo: " + x + " " + y
 		   + " " + yBaseline + "-" + yBottom));
 
-    icBeginSynchronous ();
-    window.view.imManager.updateCursorAnchorInfo (window.view, info);
-    icEndSynchronous ();
+    EmacsService.SERVICE.runOnUiThread (new Runnable () {
+	@Override
+	public void
+	run ()
+	{
+	  window.view.imManager.updateCursorAnchorInfo (window.view, info);
+	}
+    });
   }