commit 7370d42daae201f63093c4b4e84301af70af6ce9
author Android (Google) Code Review <android-gerrit@google.com> Wed Sep 30 14:12:05 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 30 14:12:05 2009 -0400
tree 565e654bed532ba6b142296979a0a2b084c769b5
parent 20e07edacad4a696956bd55c9459ea869ee2f45b
parent 43f50aa28ca823531b6e19dba555db026c04c8d7

Merge change I0bb240dc into eclair

* changes:
  Fix a sample code commented out, complying with the new vCard implementation.

src/com/android/contacts/ExportVCardActivity.java

diff --git a/src/com/android/contacts/ExportVCardActivity.java b/src/com/android/contacts/ExportVCardActivity.java
index 08f43c1..7c088ea 100644
--- a/src/com/android/contacts/ExportVCardActivity.java
+++ b/src/com/android/contacts/ExportVCardActivity.java
@@ -26,7 +26,6 @@
 import android.os.Handler;
 import android.os.PowerManager;
 import android.pim.vcard.VCardComposer;
-import android.provider.ContactsContract.Contacts;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -148,10 +147,12 @@
                 }
 
                 composer = new VCardComposer(ExportVCardActivity.this, mVCardTypeStr, true);
-                // composer = new VCardComposer(ExportVCardActivity,
-                // VCardConfig.VCARD_TYPE_V30_JAPANESE_UTF8, true);
+                /*int vcardType = (VCardConfig.VCARD_TYPE_V21_GENERIC |
+                        VCardConfig.FLAG_USE_QP_TO_PRIMARY_PROPERTIES);
+                composer = new VCardComposer(ExportVCardActivity.this, vcardType, true);*/
+
                 composer.addHandler(composer.new HandlerForOutputStream(outputStream));
- 
+
                 if (!composer.init()) {
                     final String errorReason = composer.getErrorReason();
                     Log.e(LOG_TAG, "initialization of vCard composer failed: " + errorReason);