From 617bd85cd0bd1d0a73d405d623ee3dd41c7e8a37 Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Sat, 6 Apr 2024 11:17:49 +0800
Subject: Correct typos in and omissions from earlier Android port changes

* java/AndroidManifest.xml.in: Remove duplicate permissions.

* java/org/gnu/emacs/EmacsWindowManager.java
(removeWindowConsumer): Disregard isFinishing for non-initial
activities.
---
 java/org/gnu/emacs/EmacsWindowManager.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'java/org/gnu')

diff --git a/java/org/gnu/emacs/EmacsWindowManager.java b/java/org/gnu/emacs/EmacsWindowManager.java
index a239fdc8ac2..41ea3a15809 100644
--- a/java/org/gnu/emacs/EmacsWindowManager.java
+++ b/java/org/gnu/emacs/EmacsWindowManager.java
@@ -221,11 +221,14 @@ public final class EmacsWindowManager
       {
 	consumer.detachWindow ();
 
-	/* Though pruneWindows will likely remove the same windows, call
-	   onActivityDetached anyway if isFinishing is set, as in
-	   obscure circumstances pruneWindows will not remove frames
-	   bound to the system-started task.  */
-	if (isFinishing)
+	/* Though pruneWindows will likely remove the same window(s),
+	   call onActivityDetached anyway if isFinishing is set, if
+	   CONSUMER not be a multitasking activity, as in obscure
+	   circumstances pruneWindows will not remove frames bound to
+	   the system-started task.  */
+	if (isFinishing
+	    && (!(consumer instanceof EmacsMultitaskActivity)
+		|| Build.VERSION.SDK_INT < Build.VERSION_CODES.Q))
 	  window.onActivityDetached ();
       }
 
-- 
cgit v1.2.1