mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-25 06:50:46 -08:00
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.
This commit is contained in:
parent
0286a11f31
commit
617bd85cd0
2 changed files with 9 additions and 9 deletions
|
|
@ -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 ();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue