Update Android port

* doc/emacs/android.texi (Android File System): Document what
`temp~unlinked' means in the temporary files directory.
* java/org/gnu/emacs/EmacsService.java (updateExtractedText):
New function.
* java/org/gnu/emacs/EmacsView.java (onCreateInputConnection):
Ask the input method nicely to not display the extracted text
UI.
* src/android.c (struct android_emacs_service): New method
`updateExtractedText'.
(android_hack_asset_fd_fallback): Improve naming convention.
Fix typo.
(android_init_emacs_service): Add new method.
(android_update_extracted_text): New function.
(android_open_asset): Fix typo.
* src/androidgui.h: Update prototypes.
* src/androidterm.c (struct android_get_extracted_text_context):
New field `flags'.
(android_get_extracted_text): Set flags on the frame's output
data.
(android_build_extracted_text): New function.
(getExtractedText): Move out class structures.
(android_update_selection): Send updates to extracted text if
the input method asked for them.
(android_reset_conversion): Clear extracted text flags.
* src/androidterm.h (struct android_output): New fields for
storing extracted text data.

1 files changed, 39 insertions, 5 deletions

diff --git a/src/android.c b/src/android.c
index 11b0fa5e0f3..e620a041348 100644
--- a/src/android.c
+++ b/src/android.c
@@ -112,6 +112,7 @@ struct android_emacs_service
   jmethodID check_content_uri;
   jmethodID query_battery;
   jmethodID display_toast;
+  jmethodID update_extracted_text;
 };
 
 struct android_emacs_pixmap
@@ -1236,13 +1237,12 @@ android_hack_asset_fd_fallback (AAsset *asset)
      Creating an ashmem file descriptor and reading from it doesn't
      work on these old Android versions.  */
 
-  snprintf (filename, PATH_MAX, "%s/%s.%d",
-            android_cache_dir, "temp-unlinked",
-            getpid ());
+  snprintf (filename, PATH_MAX, "%s/temp~unlinked.%d",
+            android_cache_dir, getpid ());
   fd = open (filename, O_CREAT | O_RDWR | O_TRUNC,
              S_IRUSR | S_IWUSR);
 
-  if (fd < 1)
+  if (fd < 0)
     return -1;
 
   if (unlink (filename))
@@ -2135,6 +2135,9 @@ android_init_emacs_service (void)
   FIND_METHOD (query_battery, "queryBattery", "()[J");
   FIND_METHOD (display_toast, "displayToast",
                "(Ljava/lang/String;)V");
+  FIND_METHOD (update_extracted_text, "updateExtractedText",
+               "(Lorg/gnu/emacs/EmacsWindow;"
+               "Landroid/view/inputmethod/ExtractedText;I)V");
 #undef FIND_METHOD
 }
 
@@ -5991,6 +5994,37 @@ android_reset_ic (android_window window, enum android_ic_mode mode)
   android_exception_check ();
 }
 
+/* Make updates to extracted text known to the input method on
+   WINDOW.  TEXT should be a local reference to the new
+   extracted text.  TOKEN should be the token specified by the
+   input method.  */
+
+void
+android_update_extracted_text (android_window window, void *text,
+                               int token)
+{
+  jobject object;
+  jmethodID method;
+
+  object = android_resolve_handle (window, ANDROID_HANDLE_WINDOW);
+  method = service_class.update_extracted_text;
+
+  (*android_java_env)->CallNonvirtualVoidMethod (android_java_env,
+                                                 emacs_service,
+                                                 service_class.class,
+                                                 method, object,
+                                                 /* N.B. that
+                                                   text is not
+                                                   jobject,
+                                                   because that
+                                                   type is not
+                                                   available in
+                                                   androidgui.h.  */
+                                                 (jobject) text,
+                                                 (jint) token);
+  android_exception_check_1 (text);
+}
+
 
 
 /* Window decoration management functions.  */
@@ -6083,7 +6117,7 @@ android_open_asset (const char *filename, int oflag, mode_t mode)
      get a regular file descriptor.  */
 
   fd.fd = android_open (filename, oflag, mode);
-  if (fd.fd < 1)
+  if (fd.fd < 0)
     return fd;
 
   /* Set fd.asset to NULL, signifying that it is a file