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

Commit ea21124d authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Document Telephony PendingIntent creation." into rvc-dev am: 2b210e10 

Change-Id: I767cf8eac24b43ddb4a2d2c5b1283c8c2c15dece
parents 6dbeb975 2b210e10

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -1846,6 +1846,9 @@ public class SubscriptionController extends ISub.Stub { 
                EuiccManager euiccManager = ((EuiccManager)

                EuiccManager euiccManager = ((EuiccManager)

                        mContext.getSystemService(Context.EUICC_SERVICE)).createForCardId(cardId);

                        mContext.getSystemService(Context.EUICC_SERVICE)).createForCardId(cardId);

                euiccManager.updateSubscriptionNickname(subId, displayName,

                euiccManager.updateSubscriptionNickname(subId, displayName,

                        // This PendingIntent simply fulfills the requirement to pass in a callback;

                        // we don't care about the result (hence 0 requestCode and no action

                        // specified on the intent).

                        PendingIntent.getService(

                        PendingIntent.getService(

                            mContext, 0 /* requestCode */, new Intent(), 0 /* flags */));

                            mContext, 0 /* requestCode */, new Intent(), 0 /* flags */));

            }

            }

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -2089,6 +2089,9 @@ public class ImsPhone extends ImsPhoneBase { 
                        intent.getCharSequenceExtra(EXTRA_KEY_NOTIFICATION_MESSAGE);

                        intent.getCharSequenceExtra(EXTRA_KEY_NOTIFICATION_MESSAGE);





                Intent resultIntent = new Intent(Intent.ACTION_MAIN);

                Intent resultIntent = new Intent(Intent.ACTION_MAIN);

                // Note: If the classname below is ever removed, the call to

                // PendingIntent.getActivity should also specify FLAG_IMMUTABLE to ensure the

                // pending intent cannot be tampered with.

                resultIntent.setClassName("com.android.settings",

                resultIntent.setClassName("com.android.settings",

                        "com.android.settings.Settings$WifiCallingSettingsActivity");

                        "com.android.settings.Settings$WifiCallingSettingsActivity");

                resultIntent.putExtra(EXTRA_KEY_ALERT_SHOW, true);

                resultIntent.putExtra(EXTRA_KEY_ALERT_SHOW, true);
@@ -2099,6 +2102,8 @@ public class ImsPhone extends ImsPhoneBase { 
                                mContext,

                                mContext,

                                0,

                                0,

                                resultIntent,

                                resultIntent,

                                // Note: Since resultIntent above specifies an explicit class name

                                // we do not need to specify PendingIntent.FLAG_IMMUTABLE here.

                                PendingIntent.FLAG_UPDATE_CURRENT

                                PendingIntent.FLAG_UPDATE_CURRENT

                        );

                        );