summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-29 00:38:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 00:38:59 +0000
commitcb7b449738925914812f84c961f9f4160fb86458 (patch)
tree1d98ca8899ce3e5edaa6a50cda81159add7ff979
parent8485e3c3bc6acf98f4d18ccb30c28eee591a29a1 (diff)
parent4eeedd939779fd1e72c5cb119a15b6e68d122795 (diff)
downloadpackages_apps_Contacts-cb7b449738925914812f84c961f9f4160fb86458.tar.gz
packages_apps_Contacts-cb7b449738925914812f84c961f9f4160fb86458.tar.bz2
packages_apps_Contacts-cb7b449738925914812f84c961f9f4160fb86458.zip
am 4eeedd93: am b5342537: am c1d7d6b2: Merge "Don\'t set data on ACTION_SEND intent for Vcard" into mnc-dev
* commit '4eeedd939779fd1e72c5cb119a15b6e68d122795': Don't set data on ACTION_SEND intent for Vcard
-rw-r--r--src/com/android/contacts/quickcontact/QuickContactActivity.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 8c6f842d3..60d6a62ef 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2274,11 +2274,8 @@ public class QuickContactActivity extends ContactsActivity {
final String lookupKey = mContactData.getLookupKey();
final Uri shareUri = Uri.withAppendedPath(Contacts.CONTENT_VCARD_URI, lookupKey);
final Intent intent = new Intent(Intent.ACTION_SEND);
- // Even though the data doesn't need to be set for ACTION_SEND, it does need
- // to be set so that FLAG_GRANT_READ_URI_PERMISSION can create a URI permission grant.
- intent.setDataAndType(shareUri, Contacts.CONTENT_VCARD_TYPE);
+ intent.setType(Contacts.CONTENT_VCARD_TYPE);
intent.putExtra(Intent.EXTRA_STREAM, shareUri);
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
// Launch chooser to share contact via
final CharSequence chooseTitle = getText(R.string.share_via);