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

Commit b608da2a authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Mark intents as immutable"

parents ed528d6e 11f2e288

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
@@ -5247,7 +5247,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(),
@@ -6830,7 +6831,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,

                    SystemClock.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",