From 39ddf1855bbebc5d31b544e6308a4ae49f4925b3 Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Sun, 26 Feb 2023 10:33:41 +0800
Subject: Update Android port

* doc/lispref/commands.texi (Misc Events): Update documentation.
* java/org/gnu/emacs/EmacsService.java (EmacsService)
(onStartCommand): Improve notification message.
* src/android.c (android_hack_asset_fd): Detect if ashmem is
available dynamically.
(android_detect_ashmem): New function.
* src/textconv.c (record_buffer_change): Use markers to
represent BEG and END instead.
(syms_of_textconv): Update doc string.
---
 java/org/gnu/emacs/EmacsService.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'java')

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 48c7c743014..7f4f75b5147 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -101,6 +101,8 @@ public class EmacsService extends Service
   /* Display metrics used by font backends.  */
   public DisplayMetrics metrics;
 
+  /* Flag that says whether or not to print verbose debugging
+     information.  */
   public static final boolean DEBUG_IC = false;
 
   @Override
@@ -117,8 +119,10 @@ public class EmacsService extends Service
       {
 	tem = getSystemService (Context.NOTIFICATION_SERVICE);
 	manager = (NotificationManager) tem;
-	infoBlurb = ("See (emacs)Android Environment for more"
-		     + " details about this notification.");
+	infoBlurb = ("This notification is displayed to keep Emacs"
+		     + " running while it is in the background.  You"
+		     + " may disable if you want;"
+		     + " see (emacs)Android Environment.");
 	channel
 	  = new NotificationChannel ("emacs", "Emacs persistent notification",
 				     NotificationManager.IMPORTANCE_DEFAULT);
-- 
cgit v1.2.1