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

Commit 72c0a3cf authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android Git Automerger
Browse files

am e3172405: am c86f0779: Make vCard allow users to refrain image export.... 

am e3172405: am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data.

Merge commit 'e3172405' into kraken

* commit 'e3172405':
  Make vCard allow users to refrain image export. Useful when
parents fcc08fb8 e3172405

core/java/android/pim/vcard/VCardComposer.java

+5 −3
Original line number Diff line number Diff line
@@ -534,9 +534,11 @@ public class VCardComposer { 
                .appendEmails(contentValuesListMap.get(Email.CONTENT_ITEM_TYPE))

                .appendPostals(contentValuesListMap.get(StructuredPostal.CONTENT_ITEM_TYPE))

                .appendOrganizations(contentValuesListMap.get(Organization.CONTENT_ITEM_TYPE))

                .appendWebsites(contentValuesListMap.get(Website.CONTENT_ITEM_TYPE))

                .appendPhotos(contentValuesListMap.get(Photo.CONTENT_ITEM_TYPE))

                .appendNotes(contentValuesListMap.get(Note.CONTENT_ITEM_TYPE))

                .appendWebsites(contentValuesListMap.get(Website.CONTENT_ITEM_TYPE));

        if ((mVCardType & VCardConfig.FLAG_REFRAIN_IMAGE_EXPORT) == 0) {

            builder.appendPhotos(contentValuesListMap.get(Photo.CONTENT_ITEM_TYPE));

        }

        builder.appendNotes(contentValuesListMap.get(Note.CONTENT_ITEM_TYPE))

                .appendEvents(contentValuesListMap.get(Event.CONTENT_ITEM_TYPE))

                .appendIms(contentValuesListMap.get(Im.CONTENT_ITEM_TYPE))

                .appendRelation(contentValuesListMap.get(Relation.CONTENT_ITEM_TYPE));

core/java/android/pim/vcard/VCardConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -182,6 +182,14 @@ public class VCardConfig { 
     */

    public static final int FLAG_APPEND_TYPE_PARAM = 0x04000000;



    /**

     * <P>

     * The flag asking exporter to refrain image export.

     * </P>

     * @hide will be deleted in the near future.

     */

    public static final int FLAG_REFRAIN_IMAGE_EXPORT = 0x02000000;



    //// The followings are VCard types available from importer/exporter. ////



    /**