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

Commit aa9620f8 authored by Betty Chang's avatar Betty Chang Committed by Automerger Merge Worker
Browse files

Merge "Change the intent flag to immutable" into tm-qpr-dev am: cfc1569f am: 9cb6a08d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20802849



Change-Id: If1b0f3a85a5eb96336cba7836bcb06be65a83028
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a65999cc 9cb6a08d

src/com/android/settings/notification/MediaVolumePreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceCont 
                    getWorker().getActiveLocalMediaController().getPackageName());



            pi = PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,

                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);

                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

        } else {

            final CachedBluetoothDevice bluetoothDevice =

                    ((BluetoothMediaDevice) mMediaDevice).getCachedDevice();
@@ -142,7 +142,7 @@ public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceCont 
                    && getWorker().getActiveLocalMediaController() != null);



            pi = PendingIntent.getActivity(context, 0 /* requestCode */, intent,

                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);

                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

        }



        final IconCompat icon = getBroadcastIcon(context);