Update Android port

* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
function requestSelectionUpdate.
* java/org/gnu/emacs/EmacsView.java (onCreateInputConnection):
Call it instead of losing if getting the current selection
fails.
* src/android-asset.h (AAsset_seek): Define stub.
* src/android.c (android_open): Take mode_t.
(android_open_asset, android_close_asset, android_asset_read_quit)
(android_asset_read, android_asset_lseek, android_asset_fstat):
New functions.
* src/android.h (struct android_fd_or_asset): Update prototypes.
* src/androidgui.h (enum android_ime_operation): Add new
operation to update the selection position.
* src/androidterm.c (android_handle_ime_event): Handle new
operation.
(requestSelectionUpdate): New function.
* src/fileio.c (close_file_unwind_emacs_fd): New function.
(Fcopy_file, union read_non_regular, read_non_regular)
(Finsert_file_contents): Use optimized codepath to insert
Android asset files.
* src/frame.h (enum text_conversion_operation): New operation.
* src/textconv.c (really_request_point_update)
(handle_pending_conversion_events_1, request_point_update): New
functions.
* src/textconv.h: Update prototypes.

2 files changed, 23 insertions, 7 deletions

diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java
index 38370d60727..8e626b9534b 100644
--- a/java/org/gnu/emacs/EmacsNative.java
+++ b/java/org/gnu/emacs/EmacsNative.java
@@ -203,6 +203,7 @@ public final class EmacsNative
   public static native ExtractedText getExtractedText (short window,
                                                        ExtractedTextRequest req,
                                                        int flags);
+  public static native void requestSelectionUpdate (short window);
 
 
   /* Return the current value of the selection, or -1 upon
diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index f751eaaa3e4..90a2c912a5a 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -573,20 +573,35 @@ public final class EmacsView extends ViewGroup
     /* Set a reasonable inputType.  */
     info.inputType = InputType.TYPE_CLASS_TEXT;
 
-    /* Obtain the current position of point and set it as the
-       selection.  */
-    selection = EmacsNative.getSelection (window.handle);
-
-    Log.d (TAG, "onCreateInputConnection: current selection is: " + selection);
-
     /* If this fails or ANDROID_IC_MODE_NULL was requested, then don't
        initialize the input connection.  */
-    if (mode == EmacsService.IC_MODE_NULL || selection == null)
+
+    if (mode == EmacsService.IC_MODE_NULL)
       {
         info.inputType = InputType.TYPE_NULL;
         return null;
       }
 
+    /* Obtain the current position of point and set it as the
+       selection.  */
+    selection = EmacsNative.getSelection (window.handle);
+
+    if (selection != null)
+      Log.d (TAG, "onCreateInputConnection: current selection is: "
+             + selection[0] + ", by " + selection[1]);
+    else
+      {
+        Log.d (TAG, "onCreateInputConnection: current selection could"
+               + " not be retrieved.");
+
+        /* If the selection could not be obtained, return 0 by 0.
+           However, ask for the selection position to be updated as
+           soon as possible.  */
+
+        selection = new int[] { 0, 0, };
+        EmacsNative.requestSelectionUpdate (window.handle);
+      }
+
     if (mode == EmacsService.IC_MODE_ACTION)
       info.imeOptions |= EditorInfo.IME_ACTION_DONE;