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

Commit 50dd14d1 authored by Jeremy Goldman's avatar Jeremy Goldman
Browse files

Enhanced4gLteSliceHelper specifies immutable intent 

Bug: 172812686
Fixes: 172207848
Test: atest -c Enhanced4gLteSliceHelperTest
Change-Id: I1bfac82e3ce5c66639465befb0517839fb55415e
parent 836df5eb

src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java

+3 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ public class Enhanced4gLteSliceHelper { 
        final Intent intent = new Intent(action);

        intent.setClass(mContext, SliceBroadcastReceiver.class);

        return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,

                PendingIntent.FLAG_CANCEL_CURRENT);

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);

    }



    /**
@@ -287,7 +287,8 @@ public class Enhanced4gLteSliceHelper { 
        final Intent intent = new Intent(action);

        intent.setPackage(SETTINGS_PACKAGE_NAME);

        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);

        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent,

                PendingIntent.FLAG_IMMUTABLE);

    }



    @VisibleForTesting

tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java

+3 −2
Original line number Diff line number Diff line
@@ -237,14 +237,15 @@ public class Enhanced4gLteSliceHelperTest { 
        final Intent intent = new Intent(action);

        intent.setClass(mContext, SliceBroadcastReceiver.class);

        return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,

                PendingIntent.FLAG_NO_CREATE);

                PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE);

    }



    private PendingIntent getActivityIntent(String action) {

        final Intent intent = new Intent(action);

        intent.setPackage(SETTINGS_PACKAGE_NAME);

        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);

        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent,

                PendingIntent.FLAG_IMMUTABLE);

    }



    private void assertTitle(List<SliceItem> sliceItems, String title) {