Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julia Reynolds
2020-06-03 15:59:54 +00:00
committed by Android (Google) Code Review
parent 1411e29a3e f596432fde
commit 7f07c974df
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -596,7 +596,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();
@@ -610,7 +611,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();
@@ -628,7 +629,8 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks,
.putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, pendingIntent) .putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, pendingIntent)
.putExtra(Intent.EXTRA_INSTANT_APP_FAILURE, pendingIntent); .putExtra(Intent.EXTRA_INSTANT_APP_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);