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

Commit fb2d50e8 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed 

Bug 38428650
Test: Manual test on an eng build + logcat + contacts app

Change-Id: I1b6c99b8f42443511baddd8574955a17342b2ac9
(cherry picked from commit 7d1911f2)
parent f79158f5

core/java/android/content/Intent.java

+6 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.content;



import static android.content.ContentProvider.maybeAddUserId;



import android.annotation.AnyRes;

import android.annotation.BroadcastBehavior;

import android.annotation.IntDef;
@@ -43,7 +45,7 @@ import android.os.ResultReceiver; 
import android.os.ShellCommand;

import android.os.StrictMode;

import android.os.UserHandle;

import android.os.storage.StorageManager;

import android.provider.ContactsContract.QuickContact;

import android.provider.DocumentsContract;

import android.provider.DocumentsProvider;

import android.provider.MediaStore;
@@ -51,7 +53,9 @@ import android.provider.OpenableColumns; 
import android.util.ArraySet;

import android.util.AttributeSet;

import android.util.Log;



import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlSerializer;
@@ -69,8 +73,6 @@ import java.util.Locale; 
import java.util.Objects;

import java.util.Set;



import static android.content.ContentProvider.maybeAddUserId;



/**

 * An intent is an abstract description of an operation to be performed.  It

 * can be used with {@link Context#startActivity(Intent) startActivity} to
@@ -9782,6 +9784,7 @@ public class Intent implements Parcelable, Cloneable { 
                && leavingPackage) {

            switch (mAction) {

                case ACTION_PROVIDER_CHANGED:

                case QuickContact.ACTION_QUICK_CONTACT:

                    // Ignore actions that don't need to grant

                    break;

                default: