diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-02 13:54:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-02 13:54:48 -0700 |
| commit | fa5a46a08ebcf856bf6f0f894cb82763353d87d5 (patch) | |
| tree | 67ed8e93043300b5c9117f7d52c3363b5ede9a6c /core | |
| parent | b2b973d13edb0a043a0288838f41eb84e9c78f76 (diff) | |
| parent | 3010713f50aa6ac189b1990421cfab1d426bc601 (diff) | |
| download | frameworks_base-fa5a46a08ebcf856bf6f0f894cb82763353d87d5.zip frameworks_base-fa5a46a08ebcf856bf6f0f894cb82763353d87d5.tar.gz frameworks_base-fa5a46a08ebcf856bf6f0f894cb82763353d87d5.tar.bz2 | |
am 3010713f: Fix again.
Merge commit '3010713f50aa6ac189b1990421cfab1d426bc601' into gingerbread-plus-aosp
* commit '3010713f50aa6ac189b1990421cfab1d426bc601':
Fix again.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/pim/vcard/VCardComposer.java | 8 | ||||
| -rw-r--r-- | core/java/android/pim/vcard/VCardConfig.java | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java index e409210..193cf1e 100644 --- a/core/java/android/pim/vcard/VCardComposer.java +++ b/core/java/android/pim/vcard/VCardComposer.java @@ -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)); diff --git a/core/java/android/pim/vcard/VCardConfig.java b/core/java/android/pim/vcard/VCardConfig.java index 8b7ed6e..8e759e3 100644 --- a/core/java/android/pim/vcard/VCardConfig.java +++ b/core/java/android/pim/vcard/VCardConfig.java @@ -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 |