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.

5 files changed, 48 insertions, 5 deletions

diff --git a/src/android.c b/src/android.c
index 3bccaab041a..daeb7ab70f6 100644
--- a/src/android.c
+++ b/src/android.c
@@ -112,6 +112,7 @@ struct android_emacs_service
   jmethodID open_content_uri;
   jmethodID check_content_uri;
   jmethodID query_battery;
+  jmethodID display_toast;
 };
 
 struct android_emacs_pixmap
@@ -2124,6 +2125,8 @@ android_init_emacs_service (void)
   FIND_METHOD (check_content_uri, "checkContentUri",
                "([BZZ)Z");
   FIND_METHOD (query_battery, "queryBattery", "()[J");
+  FIND_METHOD (display_toast, "displayToast",
+               "(Ljava/lang/String;)V");
 #undef FIND_METHOD
 }
 
@@ -5696,6 +5699,31 @@ android_query_battery (struct android_battery_state *status)
   return 0;
 }
 
+/* Display a small momentary notification on screen containing
+   TEXT, which must be in the modified UTF encoding used by the
+   JVM.  */
+
+void
+android_display_toast (const char *text)
+{
+  jstring string;
+
+  /* Make the string.  */
+  string = (*android_java_env)->NewStringUTF (android_java_env,
+                                              text);
+  android_exception_check ();
+
+  /* Display the toast.  */
+  (*android_java_env)->CallVoidMethod (android_java_env,
+                                       emacs_service,
+                                       service_class.display_toast,
+                                       string);
+  android_exception_check_1 (string);
+
+  /* Delete the local reference to the string.  */
+  ANDROID_DELETE_LOCAL_REF (string);
+}
+
 
 
 /* Whether or not a query is currently being made.  */
diff --git a/src/android.h b/src/android.h
index 806be4f9954..95206b77979 100644
--- a/src/android.h
+++ b/src/android.h
@@ -140,6 +140,7 @@ struct android_battery_state
 
 extern Lisp_Object android_browse_url (Lisp_Object);
 extern int android_query_battery (struct android_battery_state *);
+extern void android_display_toast (const char *);
 
 
 
diff --git a/src/androidfns.c b/src/androidfns.c
index dc68cef8a02..4837b00a21e 100644
--- a/src/androidfns.c
+++ b/src/androidfns.c
@@ -2357,6 +2357,11 @@ there is no mouse.  */)
   (void)
 {
 #ifndef ANDROID_STUBIFY
+  /* If no display connection is present, just return nil.  */
+
+  if (!android_init_gui)
+    return Qnil;
+
   return android_detect_mouse () ? Qt : Qnil;
 #else
   return Qnil;
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);
 
diff --git a/src/androidterm.c b/src/androidterm.c
index 8a67d128348..814af87819b 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -866,9 +866,8 @@ handle_one_android_event (struct android_display_info *dpyinfo,
 
       if (event->xaction.action == 0)
         {
-          /* Action 0 either means to destroy a frame or to create a
-             new frame, depending on whether or not
-             event->xaction.window exists.  */
+          /* Action 0 either means that a window has been destroyed
+             and its associated frame should be as well.  */
 
           if (event->xaction.window)
             {
@@ -878,8 +877,6 @@ handle_one_android_event (struct android_display_info *dpyinfo,
               inev.ie.kind = DELETE_WINDOW_EVENT;
               XSETFRAME (inev.ie.frame_or_window, f);
             }
-          else
-            ((void) 0) /* A new frame must be created.  */;
         }
 
     case ANDROID_ENTER_NOTIFY: