Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark intents as immutable

Browse Source 
Test: manual
Fixes: 169792886
Fixes: 169793537
Fixes: 169793764
Change-Id: I8ae9efe732b468b8e13e264b0af8f81c596e2e89
(cherry picked from commit 11f2e28846)
This commit is contained in:
Julia Reynolds
2020-10-02 15:36:50 -04:00
parent 1de72903d4
commit 90be1b5d2c
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/notification/EventConditionProvider.java
View File

@@ -271,7 +271,7 @@ public class EventConditionProvider extends SystemConditionProviderService {
new Intent(ACTION_EVALUATE) new Intent(ACTION_EVALUATE)
.addFlags(Intent.FLAG_RECEIVER_FOREGROUND) .addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
.putExtra(EXTRA_TIME, time), .putExtra(EXTRA_TIME, time),
PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
alarms.cancel(pendingIntent); alarms.cancel(pendingIntent);
if (time == 0 || time < now) { if (time == 0 || time < now) {
if (DEBUG) Slog.d(TAG, "Not scheduling evaluate: " + (time == 0 ? "no time specified" if (DEBUG) Slog.d(TAG, "Not scheduling evaluate: " + (time == 0 ? "no time specified"

5
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -5260,7 +5260,8 @@ public class NotificationManagerService extends SystemService {
Intent appIntent = getContext().getPackageManager().getLaunchIntentForPackage(pkg); Intent appIntent = getContext().getPackageManager().getLaunchIntentForPackage(pkg);
if (appIntent != null) { if (appIntent != null) {
summaryNotification.contentIntent = PendingIntent.getActivityAsUser( 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 = final StatusBarNotification summarySbn =
new StatusBarNotification(adjustedSbn.getPackageName(), new StatusBarNotification(adjustedSbn.getPackageName(),
@@ -6880,7 +6881,7 @@ public class NotificationManagerService extends SystemService {
.appendPath(record.getKey()).build()) .appendPath(record.getKey()).build())
.addFlags(Intent.FLAG_RECEIVER_FOREGROUND) .addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
.putExtra(EXTRA_KEY, record.getKey()), .putExtra(EXTRA_KEY, record.getKey()),
PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP,
mSystemClock.elapsedRealtime() + record.getNotification().getTimeoutAfter(), mSystemClock.elapsedRealtime() + record.getNotification().getTimeoutAfter(),
pi); pi);

2
services/core/java/com/android/server/notification/ScheduleConditionProvider.java
View File

@@ -223,7 +223,7 @@ public class ScheduleConditionProvider extends SystemConditionProviderService {
new Intent(ACTION_EVALUATE) new Intent(ACTION_EVALUATE)
.addFlags(Intent.FLAG_RECEIVER_FOREGROUND) .addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
.putExtra(EXTRA_TIME, time), .putExtra(EXTRA_TIME, time),
PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
alarms.cancel(pendingIntent); alarms.cancel(pendingIntent);
if (time > now) { if (time > now) {
if (DEBUG) Slog.d(TAG, String.format("Scheduling evaluate for %s, in %s, now=%s", if (DEBUG) Slog.d(TAG, String.format("Scheduling evaluate for %s, in %s, now=%s",