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

Unverified Commit 2d93c341 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-10.0.0_r46' into staging/lineage-17.1_merge-android-10.0.0_r46 

Android 10.0.0 release 46

* tag 'android-10.0.0_r46':
  Add package checking with Uid in EuiccController#getEid
  Use FLAG_IMMUTABLE for InstallCarrierAppUtils
  Use FLAG_IMMUTABLE for InboundSmsHandler
  Use FLAG_IMMUTABLE for CarrierKeyDownloadManager
  Use FLAG_IMMUTABLE for CarrierServiceStateTracker
  Use FLAG_IMMUTABLE for ServiceStateTracker
  Restrict access to the resolution PendingIntent created by EuiccController to EuiccResolutionUiDispatcherActivity
  Added FLAG_IMMUTABLE flag for security purposes
  Remove mCallQualityMetrics[callId] after call
  Check EuiccMan#isEnabled earlier before getting euiccController.
  Revert "Change log for imei"
  Revert "Support restricted data connection when roaming"

Change-Id: Iac6aefffb263f93194c83976d70759d552be5d09
parents 72f562b7 a8cb6ac1

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="

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

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ public class CarrierServiceStateTracker extends Handler { 
            Intent notificationIntent = new Intent(Settings.ACTION_DATA_ROAMING_SETTINGS);

            notificationIntent.putExtra("expandable", true);

            PendingIntent settingsIntent = PendingIntent.getActivity(context, 0, notificationIntent,

                    PendingIntent.FLAG_ONE_SHOT);

                    PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);

            CharSequence title = context.getText(

                    com.android.internal.R.string.NetworkPreferenceSwitchTitle);

            CharSequence details = context.getText(

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

+1 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
            mContext,

            0,

            new Intent(ACTION_OPEN_SMS_APP),

            PendingIntent.FLAG_ONE_SHOT);

                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);

        Notification.Builder mBuilder = new Notification.Builder(mContext)

                .setSmallIcon(com.android.internal.R.drawable.sym_action_chat)

                .setAutoCancel(true)

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

+2 −1
Original line number Diff line number Diff line
@@ -2829,7 +2829,8 @@ public class ServiceStateTracker extends Handler { 
                    AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);



                    Intent intent = new Intent(ACTION_RADIO_OFF);

                    mRadioOffIntent = PendingIntent.getBroadcast(context, 0, intent, 0);

                    mRadioOffIntent = PendingIntent.getBroadcast(

                            context, 0, intent, PendingIntent.FLAG_IMMUTABLE);



                    mAlarmSwitch = true;

                    if (DBG) log("Alarm setting");

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

+3 −3
Original line number Diff line number Diff line
@@ -2302,7 +2302,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.
@@ -4958,7 +4958,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 {
@@ -5026,7 +5026,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);

    }