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

Commit 8b14c887 authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Use FLAG_IMMUTABLE for CarrierKeyDownloadManager" into oc-mr1-dev

parents 22c956e3 0943334d

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

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ public class CarrierKeyDownloadManager { 
        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);
@@ -232,7 +232,7 @@ public class CarrierKeyDownloadManager { 
                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="