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

Commit e416fd3a authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Add FLAG_IMMUTABLE for telephony pending intents. 

Strict enforcement of the presence of FLAG_IMMUTABLE and FLAG_MUTABLE is
being enforced in S+.  Adding these flags to some pending intents in
Telephony to fix runtime crashes.

Test: build; manual regression test.
Fixes: 178716675
Fixes: 179239715
Change-Id: Ic631f3f716ec639c7a916e20e753c73845da391f
parent c3532228

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

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

                        // specified on the intent).

                        PendingIntent.getService(

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

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

                                PendingIntent.FLAG_IMMUTABLE /* flags */));

            }



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

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

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

                                0,

                                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 | PendingIntent.FLAG_IMMUTABLE

                        );



                final Notification notification = new Notification.Builder(mContext)