From dba9823ac7467cb83f306f7e89cf609c0c321be6 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Thu, 28 May 2020 10:45:19 -0400 Subject: DO NOT MERGE Make intents immutable Test: make Fixes: 154719656 Change-Id: I212ca5f1a48174ed85311b551259da314718f082 (cherry picked from commit 36b3352784ae90326a2b308542b1d2cfe18661a0) --- .../android/systemui/statusbar/phone/PhoneStatusBarPolicy.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index f3ba5aaf887d..213fff46a9dd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -560,7 +560,8 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, String message = mContext.getString(R.string.instant_apps_message); PendingIntent appInfoAction = PendingIntent.getActivity(mContext, 0, 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), appInfoAction).build(); @@ -574,7 +575,7 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); PendingIntent pendingIntent = PendingIntent.getActivity(mContext, - 0 /* requestCode */, browserIntent, 0 /* flags */); + 0 /* requestCode */, browserIntent, PendingIntent.FLAG_IMMUTABLE); ComponentName aiaComponent = null; try { aiaComponent = AppGlobals.getPackageManager().getInstantAppInstallerComponent(); @@ -590,7 +591,8 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, .putExtra(Intent.EXTRA_VERSION_CODE, appInfo.versionCode) .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), webPendingIntent).build(); builder.addAction(webAction); -- cgit v1.2.3-59-g8ed1b