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

Commit 1e8240d8 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Make intents immutable" into oc-dev

parents 2688770c dba9823a

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -560,7 +560,8 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, 
        String message = mContext.getString(R.string.instant_apps_message);

        String message = mContext.getString(R.string.instant_apps_message);

        PendingIntent appInfoAction = PendingIntent.getActivity(mContext, 0,

        PendingIntent appInfoAction = PendingIntent.getActivity(mContext, 0,

                new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)

                new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)

                        .setData(Uri.fromParts("package", pkg, null)), 0);

                        .setData(Uri.fromParts("package", pkg, null)),

                        PendingIntent.FLAG_IMMUTABLE);

        Action action = new Notification.Action.Builder(null, mContext.getString(R.string.app_info),

        Action action = new Notification.Action.Builder(null, mContext.getString(R.string.app_info),

                appInfoAction).build();

                appInfoAction).build();
@@ -574,7 +575,7 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, 
                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);





            PendingIntent pendingIntent = PendingIntent.getActivity(mContext,

            PendingIntent pendingIntent = PendingIntent.getActivity(mContext,

                    0 /* requestCode */, browserIntent, 0 /* flags */);

                    0 /* requestCode */, browserIntent, PendingIntent.FLAG_IMMUTABLE);

            ComponentName aiaComponent = null;

            ComponentName aiaComponent = null;

            try {

            try {

                aiaComponent = AppGlobals.getPackageManager().getInstantAppInstallerComponent();

                aiaComponent = AppGlobals.getPackageManager().getInstantAppInstallerComponent();
@@ -590,7 +591,8 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, 
                    .putExtra(Intent.EXTRA_VERSION_CODE, appInfo.versionCode)

                    .putExtra(Intent.EXTRA_VERSION_CODE, appInfo.versionCode)

                    .putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, pendingIntent);

                    .putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, pendingIntent);





            PendingIntent webPendingIntent = PendingIntent.getActivity(mContext, 0, goToWebIntent, 0);

            PendingIntent webPendingIntent = PendingIntent.getActivity(

                    mContext, 0, goToWebIntent, PendingIntent.FLAG_IMMUTABLE);

            Action webAction = new Notification.Action.Builder(null, mContext.getString(R.string.go_to_web),

            Action webAction = new Notification.Action.Builder(null, mContext.getString(R.string.go_to_web),

                    webPendingIntent).build();

                    webPendingIntent).build();

            builder.addAction(webAction);

            builder.addAction(webAction);