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

Commit 1406e403 authored by Azhara Assanova's avatar Azhara Assanova Committed by Android (Google) Code Review
Browse files

Merge "Make mutable implicit PendingIntent immutable"

parents d1bcb159 cb419edf

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+6 −3
Original line number Diff line number Diff line
@@ -232,10 +232,13 @@ public class BubbleExpandedView extends LinearLayout { 


                    if (mBubble.isAppBubble()) {

                        PendingIntent pi = PendingIntent.getActivity(mContext, 0,

                                mBubble.getAppBubbleIntent(),

                                PendingIntent.FLAG_MUTABLE,

                                mBubble.getAppBubbleIntent()

                                        .addFlags(FLAG_ACTIVITY_NEW_DOCUMENT)

                                        .addFlags(FLAG_ACTIVITY_MULTIPLE_TASK),

                                PendingIntent.FLAG_IMMUTABLE,

                                null);

                        mTaskView.startActivity(pi, fillInIntent, options, launchBounds);

                        mTaskView.startActivity(pi, /* fillInIntent= */ null, options,

                                launchBounds);

                    } else if (!mIsOverflow && mBubble.hasMetadataShortcutId()) {

                        options.setApplyActivityFlagsForBubbles(true);

                        mTaskView.startShortcutActivity(mBubble.getShortcutInfo(),