From 5c6dd86178d0923577ced09d962a9d872a6aa40c Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 12 Mar 2024 08:51:52 +0800 Subject: [PATCH] Fix notification cancellation detection on Android * java/org/gnu/emacs/EmacsDesktopNotification.java (display1): Don't specify FLAG_ONE_SHOT in cancel intents. (cherry picked from commit bf38783c32e794e46fd03210242f265f34257940) --- java/org/gnu/emacs/EmacsDesktopNotification.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/java/org/gnu/emacs/EmacsDesktopNotification.java b/java/org/gnu/emacs/EmacsDesktopNotification.java index f52c3d9d4fb..d05ed2e6203 100644 --- a/java/org/gnu/emacs/EmacsDesktopNotification.java +++ b/java/org/gnu/emacs/EmacsDesktopNotification.java @@ -281,11 +281,9 @@ public final class EmacsDesktopNotification if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) pending = PendingIntent.getBroadcast (context, 0, intent, - (PendingIntent.FLAG_IMMUTABLE - | PendingIntent.FLAG_ONE_SHOT)); + PendingIntent.FLAG_IMMUTABLE); else - pending = PendingIntent.getBroadcast (context, 0, intent, - PendingIntent.FLAG_ONE_SHOT); + pending = PendingIntent.getBroadcast (context, 0, intent, 0); notification.deleteIntent = pending; manager.notify (tag, 2, notification); -- 2.39.5