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

Commit e8f1c6c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev

parents 5578920e 2fc9fed8

src/com/android/settings/slices/SettingsSliceProvider.java

+3 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import androidx.slice.Slice; 
import androidx.slice.SliceProvider;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.bluetooth.BluetoothSliceBuilder;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.notification.zen.ZenModeSliceBuilder;
@@ -322,7 +323,8 @@ public class SettingsSliceProvider extends SliceProvider { 
    @Override

    public PendingIntent onCreatePermissionRequest(@NonNull Uri sliceUri,

            @NonNull String callingPackage) {

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

        final Intent settingsIntent = new Intent(Settings.ACTION_SETTINGS)

                .setPackage(Utils.SETTINGS_PACKAGE_NAME);

        final PendingIntent noOpIntent = PendingIntent.getActivity(getContext(),

                0 /* requestCode */, settingsIntent, 0 /* flags */);

        return noOpIntent;

tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java

+4 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import androidx.slice.Slice; 
import androidx.slice.SliceProvider;

import androidx.slice.widget.SliceLiveData;



import com.android.settings.Utils;

import com.android.settings.testutils.DatabaseTestUtils;

import com.android.settings.testutils.FakeToggleController;

import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
@@ -530,8 +531,10 @@ public class SettingsSliceProviderTest { 
    public void onCreatePermissionRequest_returnsSettingIntent() {

        final PendingIntent pendingIntent = mProvider.onCreatePermissionRequest(

                CustomSliceRegistry.FLASHLIGHT_SLICE_URI, "com.android.whaaaat");

        final Intent settingsIntent = new Intent(Settings.ACTION_SETTINGS)

                .setPackage(Utils.SETTINGS_PACKAGE_NAME);

        PendingIntent settingsPendingIntent =

                PendingIntent.getActivity(mContext, 0, new Intent(Settings.ACTION_SETTINGS), 0);

                PendingIntent.getActivity(mContext, 0, settingsIntent, 0);



        assertThat(pendingIntent).isEqualTo(settingsPendingIntent);

    }