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

Commit d2af473f authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat

parents a635bce2 ef401b8e

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

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class CarrierServiceStateTracker extends Handler { 


        Intent notificationIntent = new Intent(Settings.ACTION_DATA_ROAMING_SETTINGS);

        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);

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

+1 −1
Original line number Diff line number Diff line
@@ -996,7 +996,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
@@ -2386,7 +2386,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
@@ -2443,7 +2443,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.
@@ -4955,7 +4955,7 @@ public class DcTracker extends Handler { 
            Intent intent = new Intent(INTENT_DATA_STALL_ALARM);

            intent.putExtra(DATA_STALL_ALARM_TAG_EXTRA, mDataStallAlarmTag);

            mDataStallAlarmIntent = 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, mDataStallAlarmIntent);

        } else {
@@ -5025,7 +5025,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);

    }