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

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

Merge "WifiSliceHelper and associated test uses immutable PendingIntent flags"

parents 91c03a32 cd669b84

src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java

+6 −4
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.settings.wifi.calling; 


import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;

import static com.android.settings.slices.CustomSliceRegistry.WIFI_CALLING_PREFERENCE_URI;

import static com.android.settings.slices.CustomSliceRegistry.WIFI_CALLING_URI;

import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.app.PendingIntent;

import android.content.ComponentName;
@@ -539,7 +539,8 @@ public class WifiCallingSliceHelper { 
     */

    public static PendingIntent getSettingsIntent(Context context) {

        final Intent intent = new Intent(Settings.ACTION_SETTINGS);

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

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

                PendingIntent.FLAG_IMMUTABLE);

    }



    private PendingIntent getBroadcastIntent(String action) {
@@ -547,7 +548,7 @@ public class WifiCallingSliceHelper { 
        intent.setClass(mContext, SliceBroadcastReceiver.class);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

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

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);

    }



    /**
@@ -557,7 +558,8 @@ public class WifiCallingSliceHelper { 
        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, PendingIntent.FLAG_MUTABLE_UNAUDITED /* flags */);

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

                PendingIntent.FLAG_IMMUTABLE);

    }



    private Resources getResourcesForSubId(int subId) {

tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java

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

        intent.setClass(mContext, SliceBroadcastReceiver.class);

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

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);

                PendingIntent.FLAG_CANCEL_CURRENT | 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, PendingIntent.FLAG_MUTABLE_UNAUDITED /* flags */);

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

                PendingIntent.FLAG_IMMUTABLE);

    }



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