Merge "Make intents immutable" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-05-28 17:13:03 +00:00
committed by Android (Google) Code Review

View File

@@ -275,7 +275,7 @@ public class InstantAppNotifier extends SystemUI
0, 0,
new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
.setData(Uri.fromParts("package", pkg, null)), .setData(Uri.fromParts("package", pkg, null)),
0, PendingIntent.FLAG_IMMUTABLE,
null, null,
user); user);
Notification.Action action = Notification.Action action =
@@ -309,7 +309,7 @@ public class InstantAppNotifier extends SystemUI
mContext, mContext,
0 /* requestCode */, 0 /* requestCode */,
browserIntent, browserIntent,
0 /* flags */, PendingIntent.FLAG_IMMUTABLE /* flags */,
null, null,
user); user);
ComponentName aiaComponent = null; ComponentName aiaComponent = null;
@@ -331,8 +331,8 @@ public class InstantAppNotifier extends SystemUI
.putExtra(Intent.EXTRA_LONG_VERSION_CODE, appInfo.longVersionCode) .putExtra(Intent.EXTRA_LONG_VERSION_CODE, appInfo.longVersionCode)
.putExtra(Intent.EXTRA_INSTANT_APP_FAILURE, pendingIntent); .putExtra(Intent.EXTRA_INSTANT_APP_FAILURE, pendingIntent);
PendingIntent webPendingIntent = PendingIntent webPendingIntent = PendingIntent.getActivityAsUser(mContext, 0,
PendingIntent.getActivityAsUser(mContext, 0, goToWebIntent, 0, null, user); goToWebIntent, PendingIntent.FLAG_IMMUTABLE, null, user);
Notification.Action webAction = Notification.Action webAction =
new Notification.Action.Builder( new Notification.Action.Builder(
null, mContext.getString(R.string.go_to_web), webPendingIntent) null, mContext.getString(R.string.go_to_web), webPendingIntent)