Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4226fe3 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Correct PendingIntent#getActivity() flags" am: 2063bec5 am:... 

Merge "Correct PendingIntent#getActivity() flags" am: 2063bec5 am: 71eee207 am: 42912646 am: d7638aec

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

Change-Id: Ic957a19c9e6e82acf06072382c2c0e65629ff537
parents a523acbd d7638aec

packages/Tethering/src/com/android/networkstack/tethering/TetheringNotificationUpdater.java

+6 −4
Original line number Diff line number Diff line
@@ -273,8 +273,9 @@ public class TetheringNotificationUpdater { 
                mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */),

                0 /* requestCode */,

                new Intent(Settings.ACTION_TETHER_SETTINGS)

                        .setPackage(getSettingsPackageName(mContext.getPackageManager())),

                Intent.FLAG_ACTIVITY_NEW_TASK | PendingIntent.FLAG_IMMUTABLE,

                        .setPackage(getSettingsPackageName(mContext.getPackageManager()))

                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),

                PendingIntent.FLAG_IMMUTABLE,

                null /* options */);



        showNotification(R.drawable.stat_sys_tether_general, title, message,
@@ -317,8 +318,9 @@ public class TetheringNotificationUpdater { 
                mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */),

                0 /* requestCode */,

                new Intent(Settings.ACTION_TETHER_SETTINGS)

                        .setPackage(getSettingsPackageName(mContext.getPackageManager())),

                Intent.FLAG_ACTIVITY_NEW_TASK | PendingIntent.FLAG_IMMUTABLE,

                        .setPackage(getSettingsPackageName(mContext.getPackageManager()))

                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),

                PendingIntent.FLAG_IMMUTABLE,

                null /* options */);



        showNotification(R.drawable.stat_sys_tether_general, title, message,