LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742 am: b6958b47d9 am: 2ad5f4e82f

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

Change-Id: Ic957a19c9e6e82acf06072382c2c0e65629ff537
This commit is contained in:
Paul Hu
2020-06-29 12:41:49 +00:00
committed by Automerger Merge Worker
parent 060d67dbf1 2ad5f4e82f
commit 08a2695981
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Tethering/src/com/android/networkstack/tethering/TetheringNotificationUpdater.java
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,