diff options
| author | Brad Ebinger <breadley@google.com> | 2021-03-02 02:45:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-02 02:45:20 +0000 |
| commit | a2f4fdb0e3e009c95cc2f5df7fc4732154aad1e9 (patch) | |
| tree | 6144f9c97dacba62d2026b1007c5aac6f481f1a8 | |
| parent | 71bc163788e4ee6c5d1d5a93145a169adc6cf190 (diff) | |
| parent | 45ab3179defa3ddba2d206cb5d82578c243e5349 (diff) | |
| download | ims-a2f4fdb0e3e009c95cc2f5df7fc4732154aad1e9.tar.gz | |
Tag appropriate AlarmManager intents with FLAG_IMMUTABLE am: 250828c0f4 am: 8b7fdda762 am: 45ab3179de
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1612237
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I683cda1d0dae42fd9056cb53456670f07fcec4b3
3 files changed, 3 insertions, 5 deletions
diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java b/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java index 17099aa..5002b60 100644 --- a/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java +++ b/rcs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java @@ -474,7 +474,7 @@ public class CapabilityPolling { intent.putExtra("pollingType", type); mDiscoveryAlarmIntent = PendingIntent.getBroadcast(mContext, 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + msec, mDiscoveryAlarmIntent); diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/PollingTask.java b/rcs/presencepolling/src/com/android/service/ims/presence/PollingTask.java index f3b17dd..b9835bb 100644 --- a/rcs/presencepolling/src/com/android/service/ims/presence/PollingTask.java +++ b/rcs/presencepolling/src/com/android/service/ims/presence/PollingTask.java @@ -201,7 +201,7 @@ public class PollingTask { intent.putExtra("pollingTaskId", mId); mRetryAlarmIntent = PendingIntent.getBroadcast(mContext, 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE); @@ -254,4 +254,3 @@ public class PollingTask { return sb.toString(); } } - diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java index e94e51a..fb22b5e 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java @@ -109,7 +109,7 @@ public class PresenceCapabilityTask extends PresenceTask{ intent.setPackage(mContext.getPackageName()); intent.putExtra("taskId", mTaskId); PendingIntent mAlarmIntent = PendingIntent.getBroadcast(mContext, 0, intent, - PendingIntent.FLAG_ONE_SHOT); + PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT); if(sAlarmManager == null){ sAlarmManager = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE); @@ -162,4 +162,3 @@ public class PresenceCapabilityTask extends PresenceTask{ TaskManager.getDefault().removeTask(mTaskId); } }; - |