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

Commit ecaa7e3a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Added FLAG_IMMUTABLE flag for security purposes" into oc-dev am:... 

Merge "Added FLAG_IMMUTABLE flag for security purposes" into oc-dev am: 7a90d83f am: 896503f5 am: 9e733ed1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/11432360

Change-Id: Ic2e83d4d8fc5969c5b10a4477fc2b6eb2c0cdc2b
parents e64fc038 9e733ed1

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+3 −3
Original line number Diff line number Diff line
@@ -2281,7 +2281,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.
@@ -4790,7 +4790,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 {
@@ -4860,7 +4860,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);

    }