commit c6c01d51f223f74c8c9382bf336e44b65a25e95d
author Nicolas Catania <niko@google.com> Mon May 24 11:38:49 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 24 11:38:49 2010 -0700
tree 9f24ef30bb15cd7b9a0c2085ddf9d077e70746e5
parent d66b647fd85c488b90e15944c130788635ddedcd
parent e504f6dbb39c923cf361b6f53c8c47d40e7ebd15

Merge "Cleaned up dialButtonPressed."

src/com/android/contacts/ImportVCardService.java

diff --git a/src/com/android/contacts/ImportVCardService.java b/src/com/android/contacts/ImportVCardService.java
index f36e096..1482969 100644
--- a/src/com/android/contacts/ImportVCardService.java
+++ b/src/com/android/contacts/ImportVCardService.java
@@ -255,7 +255,9 @@
                 // at once. In the worst case, a user may call cancel() just before recreating
                 // mVCardParser.
                 synchronized (this) {
-                    mVCardParser = new VCardParser_V21(vcardType, charset);
+                    // TODO: ensure this change works fine.
+                    // mVCardParser = new VCardParser_V21(vcardType, charset);
+                    mVCardParser = new VCardParser_V21(vcardType);
                     if (mCanceled) {
                         mVCardParser.cancel();
                     }
@@ -275,7 +277,8 @@
                     is = mResolver.openInputStream(uri);
 
                     synchronized (this) {
-                        mVCardParser = new VCardParser_V30(vcardType, charset);
+                        // mVCardParser = new VCardParser_V30(vcardType, charset);
+                        mVCardParser = new VCardParser_V30(vcardType);
                         if (mCanceled) {
                             mVCardParser.cancel();
                         }