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

Commit de4179c6 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7266183 from 90be1b5d to rvc-qpr3-release 

Change-Id: I8b6575f0fe8fccc8042c44ea9b8eddc3afae25a7
parents e95c0fd0 90be1b5d

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

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ public class EventConditionProvider extends SystemConditionProviderService { 
                new Intent(ACTION_EVALUATE)

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND)

                        .putExtra(EXTRA_TIME, time),

                PendingIntent.FLAG_UPDATE_CURRENT);

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

        alarms.cancel(pendingIntent);

        if (time == 0 || time < now) {

            if (DEBUG) Slog.d(TAG, "Not scheduling evaluate: " + (time == 0 ? "no time specified"

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

+3 −2
Original line number Diff line number Diff line
@@ -5260,7 +5260,8 @@ public class NotificationManagerService extends SystemService { 
                Intent appIntent = getContext().getPackageManager().getLaunchIntentForPackage(pkg);

                if (appIntent != null) {

                    summaryNotification.contentIntent = PendingIntent.getActivityAsUser(

                            getContext(), 0, appIntent, 0, null, UserHandle.of(userId));

                            getContext(), 0, appIntent, PendingIntent.FLAG_IMMUTABLE, null,

                            UserHandle.of(userId));

                }

                final StatusBarNotification summarySbn =

                        new StatusBarNotification(adjustedSbn.getPackageName(),
@@ -6880,7 +6881,7 @@ public class NotificationManagerService extends SystemService { 
                                    .appendPath(record.getKey()).build())

                            .addFlags(Intent.FLAG_RECEIVER_FOREGROUND)

                            .putExtra(EXTRA_KEY, record.getKey()),

                    PendingIntent.FLAG_UPDATE_CURRENT);

                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

            mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                    mSystemClock.elapsedRealtime() + record.getNotification().getTimeoutAfter(),

                    pi);

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

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public class ScheduleConditionProvider extends SystemConditionProviderService { 
                new Intent(ACTION_EVALUATE)

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND)

                        .putExtra(EXTRA_TIME, time),

                PendingIntent.FLAG_UPDATE_CURRENT);

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

        alarms.cancel(pendingIntent);

        if (time > now) {

            if (DEBUG) Slog.d(TAG, String.format("Scheduling evaluate for %s, in %s, now=%s",