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

Commit 4d1d614b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add FLAG_IMMUTABLE for telephony pending intents." am: 5ee5ec2d am:... 

Merge "Add FLAG_IMMUTABLE for telephony pending intents." am: 5ee5ec2d am: 5917d4b0 am: 025fcc80

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1573020

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f79236b1d6c1a23672033d9be00fc2176e0a3aa
parents b4c4cdd1 025fcc80

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1941,7 +1941,8 @@ public class SubscriptionController extends ISub.Stub { 
                        // we don't care about the result (hence 0 requestCode and no action

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

                        // specified on the intent).

                        // specified on the intent).

                        PendingIntent.getService(

                        PendingIntent.getService(

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

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

                                PendingIntent.FLAG_IMMUTABLE /* flags */));

            }

            }





            int result = updateDatabase(value, subId, true);

            int result = updateDatabase(value, subId, true);

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -2134,9 +2134,7 @@ public class ImsPhone extends ImsPhoneBase { 
                                mContext,

                                mContext,

                                0,

                                0,

                                resultIntent,

                                resultIntent,

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

                                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE

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

                                PendingIntent.FLAG_UPDATE_CURRENT

                        );

                        );





                final Notification notification = new Notification.Builder(mContext)

                final Notification notification = new Notification.Builder(mContext)