diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-14 21:25:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-10-14 21:25:59 +0000 |
| commit | 432f8301a8ba6c49ea27271da185260902d44bd2 (patch) | |
| tree | cc498c7c0057b85eef2209a6561b66b1270cf54c | |
| parent | 5db5f0ab2b2de4665749cdaf3a17ca00a4c5985d (diff) | |
| parent | f54e07b6f8f77a5d3869aeeb190e6c1cfebca916 (diff) | |
| download | CalendarProvider-432f8301a8ba6c49ea27271da185260902d44bd2.tar.gz | |
Merge "Update PendingIntent mutability flags in CalendarProvider code."
3 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/providers/calendar/CalendarAlarmManager.java b/src/com/android/providers/calendar/CalendarAlarmManager.java index a203b1f..9d5a816 100644 --- a/src/com/android/providers/calendar/CalendarAlarmManager.java +++ b/src/com/android/providers/calendar/CalendarAlarmManager.java @@ -170,13 +170,13 @@ public class CalendarAlarmManager { } Intent intent = getCheckNextAlarmIntent(mContext, removeAlarms); PendingIntent pending = PendingIntent.getBroadcast(mContext, 0 /* ignored */, intent, - PendingIntent.FLAG_NO_CREATE); + PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE); if (pending != null) { // Cancel any previous Alarm check requests cancel(pending); } pending = PendingIntent.getBroadcast(mContext, 0 /* ignored */, intent, - PendingIntent.FLAG_CANCEL_CURRENT); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); // Trigger the check in 5s from now, so that we can have batch processing. long triggerAtTime = SystemClock.elapsedRealtime() + ALARM_CHECK_DELAY_MILLIS; diff --git a/src/com/android/providers/calendar/CalendarProvider2.java b/src/com/android/providers/calendar/CalendarProvider2.java index b505ba9..7e5b017 100644 --- a/src/com/android/providers/calendar/CalendarProvider2.java +++ b/src/com/android/providers/calendar/CalendarProvider2.java @@ -4834,7 +4834,7 @@ public class CalendarProvider2 extends SQLiteContentProvider implements OnAccoun mCalendarAlarm.setAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + delay, PendingIntent.getBroadcast(mContext, 0, createProviderChangedBroadcast(), - PendingIntent.FLAG_UPDATE_CURRENT)); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)); } private Intent createProviderChangedBroadcast() { diff --git a/src/com/android/providers/calendar/CalendarReceiver.java b/src/com/android/providers/calendar/CalendarReceiver.java index 55b75e0..f59968b 100644 --- a/src/com/android/providers/calendar/CalendarReceiver.java +++ b/src/com/android/providers/calendar/CalendarReceiver.java @@ -94,7 +94,7 @@ public class CalendarReceiver extends BroadcastReceiver { final PendingIntent checkIntent = PendingIntent.getBroadcast(context, NEXT_EVENT_CHECK_PENDING_CODE, CalendarAlarmManager.getCheckNextAlarmIntentForBroadcast(context), - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); final AlarmManager am = context.getSystemService(AlarmManager.class); |