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.

1 files changed, 4 insertions, 1 deletions

diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index d4017a055dd..9ba9dabde81 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -110,7 +110,10 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
         <action android:name="android.intent.action.EDIT"/>
         <action android:name="android.intent.action.PICK"/>
         <category android:name="android.intent.category.DEFAULT"/>
-        <data android:mimeType="*/*"/>
+        <!-- Don't offer to start Emacs for URLs that designate
+             resources other than files.  -->
+        <data android:mimeType="*/*" android:scheme="file"/>
+        <data android:mimeType="*/*" android:scheme="content"/>
       </intent-filter>
 
       <!-- Facilitate opening org-protocol:// URLs as well, the same