am 4a261c84: Fixing NPE in phone disambig dialog.
diff --git a/src/com/android/contacts/ImportVCardActivity.java b/src/com/android/contacts/ImportVCardActivity.java
index dcd0b74..f019f88 100644
--- a/src/com/android/contacts/ImportVCardActivity.java
+++ b/src/com/android/contacts/ImportVCardActivity.java
@@ -220,13 +220,15 @@
boolean result;
try {
result = readOneVCardFile(targetUri,
- VCardConfig.DEFAULT_CHARSET, builderCollection, null, true, null);
+ VCardConfig.DEFAULT_IMPORT_CHARSET,
+ builderCollection, null, true, null);
} catch (VCardNestedException e) {
try {
// Assume that VCardSourceDetector was able to detect the source.
// Try again with the detector.
result = readOneVCardFile(targetUri,
- VCardConfig.DEFAULT_CHARSET, counter, detector, false, null);
+ VCardConfig.DEFAULT_IMPORT_CHARSET,
+ counter, detector, false, null);
} catch (VCardNestedException e2) {
result = false;
Log.e(LOG_TAG, "Must not reach here. " + e2);
@@ -265,7 +267,8 @@
VCardSourceDetector detector = new VCardSourceDetector();
try {
- if (!readOneVCardFile(targetUri, VCardConfig.DEFAULT_CHARSET,
+ if (!readOneVCardFile(targetUri,
+ VCardConfig.DEFAULT_IMPORT_CHARSET,
detector, null, true, mErrorFileNameList)) {
continue;
}
@@ -337,7 +340,7 @@
if (charset != null) {
builder = new VCardEntryConstructor(charset, charset, false, vcardType, mAccount);
} else {
- charset = VCardConfig.DEFAULT_CHARSET;
+ charset = VCardConfig.DEFAULT_IMPORT_CHARSET;
builder = new VCardEntryConstructor(null, null, false, vcardType, mAccount);
}
VCardEntryCommitter committer = new VCardEntryCommitter(mResolver);