Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013

Change-Id: I2d1886c4bc2892d3673e87544e3e9c2bb0bb8633
This commit is contained in:
Paul Hu
2020-06-29 12:04:06 +00:00
committed by Automerger Merge Worker

View File

@@ -273,8 +273,9 @@ public class TetheringNotificationUpdater {
mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */), mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */),
0 /* requestCode */, 0 /* requestCode */,
new Intent(Settings.ACTION_TETHER_SETTINGS) new Intent(Settings.ACTION_TETHER_SETTINGS)
.setPackage(getSettingsPackageName(mContext.getPackageManager())), .setPackage(getSettingsPackageName(mContext.getPackageManager()))
Intent.FLAG_ACTIVITY_NEW_TASK | PendingIntent.FLAG_IMMUTABLE, .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
PendingIntent.FLAG_IMMUTABLE,
null /* options */); null /* options */);
showNotification(R.drawable.stat_sys_tether_general, title, message, showNotification(R.drawable.stat_sys_tether_general, title, message,
@@ -317,8 +318,9 @@ public class TetheringNotificationUpdater {
mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */), mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */),
0 /* requestCode */, 0 /* requestCode */,
new Intent(Settings.ACTION_TETHER_SETTINGS) new Intent(Settings.ACTION_TETHER_SETTINGS)
.setPackage(getSettingsPackageName(mContext.getPackageManager())), .setPackage(getSettingsPackageName(mContext.getPackageManager()))
Intent.FLAG_ACTIVITY_NEW_TASK | PendingIntent.FLAG_IMMUTABLE, .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
PendingIntent.FLAG_IMMUTABLE,
null /* options */); null /* options */);
showNotification(R.drawable.stat_sys_tether_general, title, message, showNotification(R.drawable.stat_sys_tether_general, title, message,