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

Commit 7d5483f6 authored by Jeremy Goldman's avatar Jeremy Goldman Committed by Android (Google) Code Review
Browse files

Merge "Enhanced4gLteSliceHelper specifies immutable intent"

parents fd6645be 50dd14d1

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) {