feature/android 24910d3f37 5/6: Fix crashes in Android port

[Po Lu]

branch: feature/android
commit 24910d3f375a11360c66b742e1054b55e9e25ccc
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Fix crashes in Android port
    
    * java/org/gnu/emacs/EmacsService.java (queryTree): Fix NULL
    pointer dereference.
    * src/android.c (android_query_tree): Set *nchildren_return.
---
 java/org/gnu/emacs/EmacsService.java | 4 +++-
 src/android.c                        | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/gnu/emacs/EmacsService.java 
b/java/org/gnu/emacs/EmacsService.java
index 01a1695f38..c008300dd3 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -304,7 +304,9 @@ public class EmacsService extends Service
     array = new short[windowList.size () + 1];
     i = 1;
 
-    array[0] = window.parent != null ? 0 : window.parent.handle;
+    array[0] = (window == null
+               ? 0 : (window.parent != null
+                      ? window.parent.handle : 0));
 
     for (EmacsWindow treeWindow : windowList)
       array[i++] = treeWindow.handle;
diff --git a/src/android.c b/src/android.c
index eab18dc615..fba43129ee 100644
--- a/src/android.c
+++ b/src/android.c
@@ -3148,6 +3148,7 @@ android_query_tree (android_window handle, android_window 
*root_return,
   *root_return = 0;
   *parent_return = shorts[0];
   *children_return = children;
+  *nchildren_return = nelements - 1;
 
   /* Release the array contents.  */
   (*android_java_env)->ReleaseShortArrayElements (android_java_env, array,