Update Android port

* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu)
(addSubmenu, inflateMenuItems): Handle tooltips correctly.
* src/android.c (android_scan_directory_tree): Fix limit
generation for root directory.
* src/androidmenu.c (android_init_emacs_context_menu)
(android_menu_show): Implement menu item help text on Android
8.0 and later.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/android.c b/src/android.c
index 0627b44f8fd..4639d84a2a1 100644
--- a/src/android.c
+++ b/src/android.c
@@ -777,13 +777,17 @@ android_scan_directory_tree (char *file, size_t *limit_return)
 
   /* If there are no tokens, just return the start of the directory
      tree.  */
+
   if (!ntokens)
     {
       SAFE_FREE ();
 
-      /* Subtract the initial header bytes.  */
+      /* Return the size of the directory tree as the limit.
+         Do not subtract the initial header bytes, as the limit
+         is an offset from the start of the file.  */
+
       if (limit_return)
-        *limit_return = directory_tree_size - 5;
+        *limit_return = directory_tree_size;
 
       return start;
     }