aboutsummaryrefslogtreecommitdiffstats
path: root/java/org
diff options
context:
space:
mode:
authorPo Lu2023-09-04 09:42:10 +0800
committerPo Lu2023-09-04 09:42:10 +0800
commit4bbad20d70f2fc9b084b8c5cfd18b5ddfb78df78 (patch)
tree410d10287f8ee5bf7d0863376dd6a1b88a36d6fb /java/org
parent8255b9c1f10a0789c724dbdbe2c47eaa633f6697 (diff)
downloademacs-4bbad20d70f2fc9b084b8c5cfd18b5ddfb78df78.tar.gz
emacs-4bbad20d70f2fc9b084b8c5cfd18b5ddfb78df78.zip
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.
Diffstat (limited to 'java/org')
-rw-r--r--java/org/gnu/emacs/EmacsService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index fb123769bdf..05952f98cf1 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -889,8 +889,6 @@ public final class EmacsService extends Service
889 0); 889 0);
890 info = builder.build (); 890 info = builder.build ();
891 891
892
893
894 if (DEBUG_IC) 892 if (DEBUG_IC)
895 Log.d (TAG, ("updateCursorAnchorInfo: " + x + " " + y 893 Log.d (TAG, ("updateCursorAnchorInfo: " + x + " " + y
896 + " " + yBaseline + "-" + yBottom)); 894 + " " + yBaseline + "-" + yBottom));
@@ -1142,8 +1140,10 @@ public final class EmacsService extends Service
1142 if (DEBUG_IC) 1140 if (DEBUG_IC)
1143 Log.d (TAG, "updateExtractedText: @" + token + ", " + text); 1141 Log.d (TAG, "updateExtractedText: @" + token + ", " + text);
1144 1142
1143 icBeginSynchronous ();
1145 window.view.imManager.updateExtractedText (window.view, 1144 window.view.imManager.updateExtractedText (window.view,
1146 token, text); 1145 token, text);
1146 icEndSynchronous ();
1147 } 1147 }
1148 1148
1149 1149