Update Android port

* java/org/gnu/emacs/EmacsService.java (readDirectoryEntry): Fix
potential NULL dereference.

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 036bc9cf098d75c426d7274e09efec8037f5fab3..d91d8f6600910c10362d01f92aa80e7f6ca0d037 100644 (file)
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -1522,7 +1522,8 @@ public final class EmacsService extends Service
            return entry;
          }
 
-       if (type.equals (Document.MIME_TYPE_DIR))
+       if (type != null
+           && type.equals (Document.MIME_TYPE_DIR))
          entry.d_type = 1;
        entry.d_name = name;
        return entry;