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

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

Merge "Use FLAG_IMMUTABLE for CarrierKeyDownloadManager" into pi-dev am: fdf9e4b4 am: 6757aa3b 

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

Change-Id: If48dec333db69a6b9b94df0ddbd952d5857f0664
parents 02a62071 6757aa3b

src/java/com/android/internal/telephony/CarrierKeyDownloadManager.java

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class CarrierKeyDownloadManager extends Handler { 
        int slotId = mPhone.getPhoneId();

        Intent intent = new Intent(INTENT_KEY_RENEWAL_ALARM_PREFIX + slotId);

        PendingIntent carrierKeyDownloadIntent = PendingIntent.getBroadcast(mContext, 0, intent,

                PendingIntent.FLAG_UPDATE_CURRENT);

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

        AlarmManager alarmManager =

                (AlarmManager) mContext.getSystemService(mContext.ALARM_SERVICE);

        alarmManager.cancel(carrierKeyDownloadIntent);
@@ -269,7 +269,7 @@ public class CarrierKeyDownloadManager extends Handler { 
                Context.ALARM_SERVICE);

        Intent intent = new Intent(INTENT_KEY_RENEWAL_ALARM_PREFIX + slotId);

        PendingIntent carrierKeyDownloadIntent = PendingIntent.getBroadcast(mContext, 0, intent,

                PendingIntent.FLAG_UPDATE_CURRENT);

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

        alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, minExpirationDate,

                carrierKeyDownloadIntent);

        Log.d(LOG_TAG, "setRenewelAlarm: action=" + intent.getAction() + " time="