diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 23:45:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 23:45:44 +0000 |
| commit | 9e733ed1333511be4887d2f1e343017151197dac (patch) | |
| tree | 29e1014a0beb606a78b47edcf0cbdefc286708ab | |
| parent | dd68c50a37b3063ce59c930b8a6b4f2609574e5c (diff) | |
| parent | 896503f51a88dd73b74447ee1acc05dabbabe5f8 (diff) | |
| download | telephony-9e733ed1333511be4887d2f1e343017151197dac.tar.gz | |
Merge "Added FLAG_IMMUTABLE flag for security purposes" into oc-dev am: 7a90d83ff9 am: 896503f51a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/11432360
Change-Id: I711c03766c77cdceec9fda4446f71a4b0ed322bb
| -rw-r--r-- | src/java/com/android/internal/telephony/dataconnection/DcTracker.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java index 850ccaa293..7d2569a0ca 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java @@ -2266,7 +2266,7 @@ public class DcTracker extends Handler { } PendingIntent alarmIntent = PendingIntent.getBroadcast(mPhone.getContext(), 0, - intent, PendingIntent.FLAG_UPDATE_CURRENT); + intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); apnContext.setReconnectIntent(alarmIntent); // Use the exact timer instead of the inexact one to provide better user experience. @@ -4773,7 +4773,7 @@ public class DcTracker extends Handler { Intent intent = new Intent(INTENT_DATA_STALL_ALARM); intent.putExtra(DATA_STALL_ALARM_TAG_EXTRA, mDataStallAlarmTag); mDataStallAlarmIntent = PendingIntent.getBroadcast(mPhone.getContext(), 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); mAlarmManager.set(AlarmManager.ELAPSED_REALTIME, SystemClock.elapsedRealtime() + delayInMs, mDataStallAlarmIntent); } else { @@ -4843,7 +4843,7 @@ public class DcTracker extends Handler { Intent intent = new Intent(INTENT_PROVISIONING_APN_ALARM); intent.putExtra(PROVISIONING_APN_ALARM_TAG_EXTRA, mProvisioningApnAlarmTag); mProvisioningApnAlarmIntent = PendingIntent.getBroadcast(mPhone.getContext(), 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + delayInMs, mProvisioningApnAlarmIntent); } |