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

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

Merge "Use FLAG_IMMUTABLE for CarrierKeyDownloadManager" into rvc-dev am: 80d12d98 

Change-Id: If2de9a64835b100e7e0bfdf5bad9a4e3ee36a951
parents bd393e29 80d12d98

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

+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,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);
@@ -271,7 +271,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.RTC_WAKEUP, minExpirationDate, carrierKeyDownloadIntent);

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

                + new Date(minExpirationDate));