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

Commit 5a2b08a5 authored by Gavin Corkery's avatar Gavin Corkery Committed by Android (Google) Code Review
Browse files

Merge "Add immutability flag to PendingIntents" into rvc-qpr-dev

parents 3a9dd32f a335516a

packages/Shell/src/com/android/shell/BugreportProgressService.java

+2 −2
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ public class BugreportProgressService extends Service { 
        intent.setClass(context, BugreportProgressService.class);

        intent.putExtra(EXTRA_ID, info.id);

        return PendingIntent.getService(context, info.id, intent,

                PendingIntent.FLAG_UPDATE_CURRENT);

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

    }



    /**
@@ -1244,7 +1244,7 @@ public class BugreportProgressService extends Service { 
                .setTicker(title)

                .setContentText(content)

                .setContentIntent(PendingIntent.getService(mContext, info.id, shareIntent,

                        PendingIntent.FLAG_UPDATE_CURRENT))

                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE))

                .setDeleteIntent(newCancelIntent(mContext, info));



        if (!TextUtils.isEmpty(info.getName())) {