From 01f4385d86537cf656cfc70ea075177d50619206 Mon Sep 17 00:00:00 2001 From: Daisuke Miyakawa Date: Thu, 4 Mar 2010 11:01:25 +0900 Subject: Handle the string "default" and ignore it appropriately. --- core/java/android/pim/vcard/VCardConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/java/android/pim') diff --git a/core/java/android/pim/vcard/VCardConfig.java b/core/java/android/pim/vcard/VCardConfig.java index ecd089a..3442ae7 100644 --- a/core/java/android/pim/vcard/VCardConfig.java +++ b/core/java/android/pim/vcard/VCardConfig.java @@ -330,7 +330,7 @@ public class VCardConfig { (VCARD_TYPE_V21_JAPANESE_MOBILE | FLAG_DOCOMO); /* package */ static final String VCARD_TYPE_DOCOMO_STR = "docomo"; - + public static int VCARD_TYPE_DEFAULT = VCARD_TYPE_V21_GENERIC_UTF8; private static final Map sVCardTypeMap; @@ -363,6 +363,8 @@ public class VCardConfig { final String loweredKey = vcardTypeString.toLowerCase(); if (sVCardTypeMap.containsKey(loweredKey)) { return sVCardTypeMap.get(loweredKey); + } else if ("default".equalsIgnoreCase(vcardTypeString)) { + return VCARD_TYPE_DEFAULT; } else { Log.e(LOG_TAG, "Unknown vCard type String: \"" + vcardTypeString + "\""); return VCARD_TYPE_DEFAULT; -- cgit v1.1