diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-09-04 09:42:10 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-09-04 09:42:10 +0800 |
| commit | 4bbad20d70f2fc9b084b8c5cfd18b5ddfb78df78 (patch) | |
| tree | 410d10287f8ee5bf7d0863376dd6a1b88a36d6fb /java/org/gnu/emacs/EmacsService.java | |
| parent | 8255b9c1f10a0789c724dbdbe2c47eaa633f6697 (diff) | |
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/gnu/emacs/EmacsService.java')
| -rw-r--r-- | java/org/gnu/emacs/EmacsService.java | 4 |
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 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 (); } |