Fix input method synchronization problems

* java/debug.sh (gdbserver_cmd, is_root): Prefer TCP again.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
function `queryAndSpin'.
* java/org/gnu/emacs/EmacsService.java (EmacsService)
(icBeginSynchronous, icEndSynchronous, viewGetSelection): New
synchronization functions.
(resetIC, updateCursorAnchorInfo): Call those instead.
* java/org/gnu/emacs/EmacsView.java (onCreateInputConnection):
Call viewGetSelection.
* src/android.c (JNICALL, android_answer_query_spin): New
functions.

1 files changed, 26 insertions, 0 deletions

diff --git a/src/android.c b/src/android.c
index e74d40a0cdb..f59c0d9e5d2 100644
--- a/src/android.c
+++ b/src/android.c
@@ -2997,6 +2997,7 @@ NATIVE_NAME (blitRect) (JNIEnv *env, jobject object,
 
 static void android_begin_query (void);
 static void android_end_query (void);
+static void android_answer_query_spin (void);
 
 JNIEXPORT void JNICALL
 NATIVE_NAME (beginSynchronous) (JNIEnv *env, jobject object)
@@ -3014,6 +3015,14 @@ NATIVE_NAME (endSynchronous) (JNIEnv *env, jobject object)
   android_end_query ();
 }
 
+JNIEXPORT void JNICALL
+NATIVE_NAME (answerQuerySpin) (JNIEnv *env, jobject object)
+{
+  JNI_STACK_ALIGNMENT_PROLOGUE;
+
+  android_answer_query_spin ();
+}
+
 #ifdef __clang__
 #pragma clang diagnostic pop
 #else
@@ -7041,6 +7050,23 @@ android_answer_query (void)
   sem_post (&android_query_sem);
 }
 
+/* Like `android_answer_query'.  However, the query may not have
+   begun; spin until it has.  */
+
+static void
+android_answer_query_spin (void)
+{
+  int n;
+
+  while (!(n = __atomic_load_n (&android_servicing_query,
+                                __ATOMIC_SEQ_CST)))
+    eassert (!n);
+
+  /* Note that this function is supposed to be called before
+     `android_begin_query' starts, so clear the service flag.  */
+  android_check_query ();
+}
+
 /* Notice that the Emacs thread will start blocking waiting for a
    response from the UI thread.  Process any pending queries from the
    UI thread.