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

Commit fa206670 authored by Steve Elliott's avatar Steve Elliott Committed by Android (Google) Code Review
Browse files

Merge "Mark implicit PendingIntents as immutable"

parents a55ddc96 84e08280

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotNotificationsController.java

+4 −2
Original line number Diff line number Diff line
@@ -205,7 +205,8 @@ public class ScreenshotNotificationsController { 
        mPublicNotificationBuilder

                .setContentTitle(mResources.getString(R.string.screenshot_saved_title))

                .setContentText(mResources.getString(R.string.screenshot_saved_text))

                .setContentIntent(PendingIntent.getActivity(mContext, 0, launchIntent, 0))

                .setContentIntent(PendingIntent

                        .getActivity(mContext, 0, launchIntent, PendingIntent.FLAG_IMMUTABLE))

                .setWhen(now)

                .setAutoCancel(true)

                .setColor(mContext.getColor(
@@ -213,7 +214,8 @@ public class ScreenshotNotificationsController { 
        mNotificationBuilder

                .setContentTitle(mResources.getString(R.string.screenshot_saved_title))

                .setContentText(mResources.getString(R.string.screenshot_saved_text))

                .setContentIntent(PendingIntent.getActivity(mContext, 0, launchIntent, 0))

                .setContentIntent(PendingIntent

                        .getActivity(mContext, 0, launchIntent, PendingIntent.FLAG_IMMUTABLE))

                .setWhen(now)

                .setAutoCancel(true)

                .setColor(mContext.getColor(

packages/SystemUI/src/com/android/systemui/util/leak/LeakReporter.java

+6 −2
Original line number Diff line number Diff line
@@ -104,9 +104,13 @@ public class LeakReporter { 
                    .setContentText(String.format(

                            "SystemUI has detected %d leaked objects. Tap to send", garbageCount))

                    .setSmallIcon(com.android.internal.R.drawable.stat_sys_adb)

                    .setContentIntent(PendingIntent.getActivityAsUser(mContext, 0,

                    .setContentIntent(PendingIntent.getActivityAsUser(

                            mContext,

                            0,

                            getIntent(hprofFile, dumpFile),

                            PendingIntent.FLAG_UPDATE_CURRENT, null, UserHandle.CURRENT));

                            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE,

                            null,

                            UserHandle.CURRENT));

            notiMan.notify(TAG, 0, builder.build());

        } catch (IOException e) {

            Log.e(TAG, "Couldn't dump heap for leak", e);