Update Android port

* doc/emacs/android.texi (Android Windowing): Reword
documentation.
* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity):
* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu):
* java/org/gnu/emacs/EmacsFontDriver.java (EmacsFontDriver):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java
(EmacsSdk7FontDriver):
* java/org/gnu/emacs/EmacsService.java (queryBattery):
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow): Make
functions final and classes static where necessary.
* src/android.c (struct android_emacs_service): New method
`display_toast'.
(android_init_emacs_service): Load new method.
(android_display_toast): New function.
* src/android.h: Export.
* src/androidfns.c (Fandroid_detect_mouse):
* src/androidselect.c (Fandroid_clipboard_owner_p)
(Fandroid_set_clipboard, Fandroid_get_clipboard)
(Fandroid_browse_url): Prevent crashes when called from
libandroid-emacs.so.
* src/androidterm.c (handle_one_android_event): Fix out of date
commentary.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/androidselect.c b/src/androidselect.c
index 3947ab99166..f54a6d6f52c 100644
--- a/src/androidselect.c
+++ b/src/androidselect.c
@@ -110,6 +110,9 @@ determined.  */)
 {
   jint rc;
 
+  if (!android_init_gui)
+    error ("Accessing clipboard without display connection");
+
   block_input ();
   rc = (*android_java_env)->CallIntMethod (android_java_env,
                                            clipboard,
@@ -133,6 +136,9 @@ DEFUN ("android-set-clipboard", Fandroid_set_clipboard,
 {
   jarray bytes;
 
+  if (!android_init_gui)
+    error ("Accessing clipboard without display connection");
+
   CHECK_STRING (string);
   string = ENCODE_UTF_8 (string);
 
@@ -167,6 +173,9 @@ Alternatively, return nil if the clipboard is empty.  */)
   size_t length;
   jbyte *data;
 
+  if (!android_init_gui)
+    error ("No Android display connection!");
+
   method = clipboard_class.get_clipboard;
   bytes
     = (*android_java_env)->CallObjectMethod (android_java_env,
@@ -217,6 +226,9 @@ URL with a scheme specified.  Signal an error upon failure.  */)
 {
   Lisp_Object value;
 
+  if (!android_init_gui)
+    error ("No Android display connection!");
+
   CHECK_STRING (url);
   value = android_browse_url (url);