PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 306f776fc3

Browse Source 
Change-Id: I6286e372401c62919998401972401b6ddf616a7b
This commit is contained in:
Automerger Merge Worker
2020-03-05 08:18:13 +00:00
parent 9fe8ed6ec5 306f776fc3
commit a8c2f1cb3c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -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;