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

Commit 4362cd4b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a mutability flag when create a PendingIntent." am: 3bf385a5 

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1452715

Change-Id: I5fe1a724a73a0c94e4dec01336ee8574b052dd9e
parents 547c8bdd 3bf385a5

src/com/android/server/telecom/ui/MissedCallNotifierImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -518,7 +518,8 @@ public class MissedCallNotifierImpl extends CallsManagerListenerBase implements 
            UserHandle userHandle) {

        Intent intent = new Intent(action, data, mContext, TelecomBroadcastReceiver.class);

        intent.putExtra(TelecomBroadcastIntentProcessor.EXTRA_USERHANDLE, userHandle);

        return PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);

        return PendingIntent.getBroadcast(mContext, 0, intent,

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

    }



    /**

tests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java

+4 −4
Original line number Diff line number Diff line
@@ -388,9 +388,9 @@ public class MissedCallNotifierImplTest extends TelecomTestCase { 
                TelecomBroadcastReceiver.class);



        assertNotNull(PendingIntent.getBroadcast(mContext, REQUEST_ID,

                callBackIntent, PendingIntent.FLAG_NO_CREATE));

                callBackIntent, PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE));

        assertNotNull(PendingIntent.getBroadcast(mContext, REQUEST_ID,

                smsIntent, PendingIntent.FLAG_NO_CREATE));

                smsIntent, PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE));

    }



    @SmallTest
@@ -424,9 +424,9 @@ public class MissedCallNotifierImplTest extends TelecomTestCase { 
                TelecomBroadcastReceiver.class);



        assertNotNull(PendingIntent.getBroadcast(mContext, REQUEST_ID,

                callBackIntent, PendingIntent.FLAG_NO_CREATE));

                callBackIntent, PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE));

        assertNull(PendingIntent.getBroadcast(mContext, REQUEST_ID,

                smsIntent, PendingIntent.FLAG_NO_CREATE));

                smsIntent, PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE));

    }



    @SmallTest