From fb2d50e891ea1ce81ec792a8ae29d2a9429bf9fc Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Fri, 9 Jun 2017 12:30:09 -0700 Subject: 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 7d1911f264c7234495204566b6633532531aa21b) --- core/java/android/content/Intent.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 852e5f708ec3..f70215b46a5e 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -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: -- cgit v1.2.3-59-g8ed1b