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

Commit fb353df1 authored by Grace Jia's avatar Grace Jia
Browse files

Add a mutability flag when create a PendingIntent. 

It is soon going to be required for apps targeting S+ to specify
explicitly either FLAG_MUTABLE or FLAG_IMMUTABLE when creating a
PendingIntent.
Previously, PendingIntents used to be mutable by default.

Test: atest TelecomUnitTests:MissedCallNotifierImplTest
Bug: 170159387
Change-Id: I4595a5c0ef3e9dcefd531bd45e01db316e5cf318
parent 4debabe3

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