From db704687bb9992212cec0d5435f6dcd75161e229 Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Mon, 2 Oct 2023 11:00:39 +0800
Subject: Update Android port

* java/AndroidManifest.xml.in: Exclude non-files from opening in
Emacs.

* java/org/gnu/emacs/EmacsOpenActivity.java (onCreate): Avert
crash should scheme be NULL.
---
 java/org/gnu/emacs/EmacsOpenActivity.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'java/org/gnu')

diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java
index d27139e98bc..202b3c8c5dc 100644
--- a/java/org/gnu/emacs/EmacsOpenActivity.java
+++ b/java/org/gnu/emacs/EmacsOpenActivity.java
@@ -438,6 +438,12 @@ public final class EmacsOpenActivity extends Activity
 
 	scheme = uri.getScheme ();
 
+	/* It is possible for scheme to be NULL, under Android 2.3 at
+	   least.  */
+
+	if (scheme == null)
+	  return;
+
 	/* If URL is a mailto URI, call `message-mailto' much the same
 	   way emacsclient-mail.desktop does.  */
 
-- 
cgit v1.2.1