commit 8c1cdbbccd5169122c183f6fbfd4436faacf2a1d
author Daisuke Miyakawa <dmiyakawa@google.com> Mon Sep 13 13:37:49 2010 -0700
committer Daisuke Miyakawa <dmiyakawa@google.com> Mon Sep 13 13:39:30 2010 -0700
tree 7b72489d64cf9e31edc4c0651768e9029b04a618
parent 465aa5d5706ba56c74c1249a17a6df80b0f42972

Add FLAG_REFRAIN_IMAGE_EXPORT support.

Bug: 2603200
Change-Id: I033a195e1d6860dda149eae14f81f1e02a73b200

java/com/android/vcard/VCardComposer.java

diff --git a/java/com/android/vcard/VCardComposer.java b/java/com/android/vcard/VCardComposer.java
index cbebf62..f3b6690 100644
--- a/java/com/android/vcard/VCardComposer.java
+++ b/java/com/android/vcard/VCardComposer.java
@@ -609,9 +609,11 @@
                     .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))
                     .appendSipAddresses(contentValuesListMap.get(SipAddress.CONTENT_ITEM_TYPE))

java/com/android/vcard/VCardConfig.java

diff --git a/java/com/android/vcard/VCardConfig.java b/java/com/android/vcard/VCardConfig.java
index 077c4fa..c43d672 100644
--- a/java/com/android/vcard/VCardConfig.java
+++ b/java/com/android/vcard/VCardConfig.java
@@ -258,6 +258,14 @@
      */
     public static final int FLAG_TORELATE_NEST = 0x01000000;
 
+    /**
+     * <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 = 0x00800000;
+
     //// The followings are VCard types available from importer/exporter. ////
 
     /**