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

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

am 3010713f: Fix again. 

Merge commit '3010713f' into gingerbread-plus-aosp

* commit '3010713f':
  Fix again.
parents b2b973d1 3010713f

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

+5 −3
Original line number Diff line number Diff line
@@ -607,9 +607,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

+2 −0
Original line number Diff line number Diff line
@@ -260,6 +260,8 @@ public class VCardConfig { 


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



    public static final int FLAG_REFRAIN_IMAGE_EXPORT = 0x00800000;



    /**

     * <p>

     * The type indicating nothing. Used by {@link VCardSourceDetector} when it