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

Commit e834845b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6511878 from 80d12d98 to rvc-release 

Change-Id: I71890d3acb31754d61632a347bca946524343fa2
parents 2438d7d2 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));

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

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,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);

            Resources res = SubscriptionManager.getResourcesForSubId(context, mPhone.getSubId());

            CharSequence title = res.getText(

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

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

+3 −0
Original line number Diff line number Diff line
@@ -2529,6 +2529,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                        AsyncResult.forMessage(result, null,

                                CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                        result.sendToTarget();

                        return;

                    }

                    request.specifiers.add(rasInHalFormat);

                }
@@ -2565,6 +2566,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                        AsyncResult.forMessage(result, null,

                                CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                        result.sendToTarget();

                        return;

                    }



                    request.specifiers.add(rasInHalFormat);
@@ -2606,6 +2608,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                        AsyncResult.forMessage(result, null,

                                CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));

                        result.sendToTarget();

                        return;

                    }



                    request.specifiers.add(rasInHalFormat);

src/java/com/android/internal/telephony/uicc/InstallCarrierAppUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ public class InstallCarrierAppUtils { 
                Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT, 1) == 1;



        PendingIntent goToStore = PendingIntent.getActivity(context, 0,

                getPlayStoreIntent(pkgName), PendingIntent.FLAG_UPDATE_CURRENT);

                getPlayStoreIntent(pkgName), PendingIntent.FLAG_UPDATE_CURRENT

                        | PendingIntent.FLAG_IMMUTABLE);



        Notification.Action goToStoreAction =

                new Notification.Action.Builder(null, downloadButtonText, goToStore).build();