Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f82ddac1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Cancel NotificationTimeout alarms when canceling notification" am: 9e7ac57a am: c60c7a1a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695745

Change-Id: I4cff81ddbbfb6d5b250ed210399ef72619daf8e1
parents f4b981eb c60c7a1a

services/core/java/com/android/server/notification/NotificationManagerService.java

+15 −0
Original line number Diff line number Diff line
@@ -7745,6 +7745,21 @@ public class NotificationManagerService extends SystemService { 
            int rank, int count, boolean wasPosted, String listenerName) {

        final String canceledKey = r.getKey();



        // Get pending intent used to create alarm, use FLAG_NO_CREATE if PendingIntent

        // does not already exist, then null will be returned.

        final PendingIntent pi = PendingIntent.getBroadcast(getContext(),

                REQUEST_CODE_TIMEOUT,

                new Intent(ACTION_NOTIFICATION_TIMEOUT)

                        .setData(new Uri.Builder().scheme(SCHEME_TIMEOUT)

                                .appendPath(r.getKey()).build())

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE);



        // Cancel alarm corresponding to pi.

        if (pi != null) {

            mAlarmManager.cancel(pi);

        }



        // Record caller.

        recordCallerLocked(r);