From: Po Lu <luangruo@yahoo.com>
Date: Fri, 7 Jul 2023 06:22:38 +0000 (+0800)
Subject: Update Android port
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e40dca8361dfa8aafbe17bfeb8ad06b6ba5230ad;p=emacs.git

Update Android port

* java/org/gnu/emacs/EmacsSurfaceView.java (copyToFrontBuffer):
Use fallback bit blit function on Android 7.0 as well, as
crashes have been observed in drawBitmap.
---

diff --git a/java/org/gnu/emacs/EmacsSurfaceView.java b/java/org/gnu/emacs/EmacsSurfaceView.java
index 5b3e05eb9f4..3f62af4ab99 100644
--- a/java/org/gnu/emacs/EmacsSurfaceView.java
+++ b/java/org/gnu/emacs/EmacsSurfaceView.java
@@ -76,7 +76,9 @@ public final class EmacsSurfaceView extends View
     EmacsService.checkEmacsThread ();
 
     if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O
-	&& Build.VERSION.SDK_INT != Build.VERSION_CODES.O_MR1)
+	&& Build.VERSION.SDK_INT != Build.VERSION_CODES.O_MR1
+	&& Build.VERSION.SDK_INT != Build.VERSION_CODES.N_MR1
+	&& Build.VERSION.SDK_INT != Build.VERSION_CODES.N)
       {
 	/* If `drawBitmap' can safely be used while a bitmap is locked
 	   by another thread, continue here... */
@@ -89,8 +91,8 @@ public final class EmacsSurfaceView extends View
       }
     else
       {
-	/* But if it can not, as on Android 8.0 and 8.1, then use a
-	   replacement function.  */
+	/* But if it can not, as on Android 7.0 through 8.1, then use
+	   a replacement function.  */
 
 	if (damageRect != null)
 	  EmacsNative.blitRect (bitmap, frontBuffer,