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

Commit 1319e4b5 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

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

Merge "Added FLAG_IMMUTABLE flag for security purposes" into rvc-dev am: 1660de58 am: 8e7481a5 am: f1da1181 am: ebf73b93

Change-Id: I4a8b2838d77ba6031f5dc30df05f387d124cd5e2
parents 213cd377 ebf73b93

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

+2 −2
Original line number Diff line number Diff line
@@ -4904,7 +4904,7 @@ public class DcTracker extends Handler { 
            intent.putExtra(INTENT_DATA_STALL_ALARM_EXTRA_TRANSPORT_TYPE, mTransportType);

            SubscriptionManager.putPhoneIdAndSubIdExtra(intent, mPhone.getPhoneId());

            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 {
@@ -4972,7 +4972,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);

    }