diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-03-04 11:01:25 +0900 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-03-04 11:01:25 +0900 |
| commit | 01f4385d86537cf656cfc70ea075177d50619206 (patch) | |
| tree | 1a24bd2f6911ea6343134cf1ddac45e213f9a814 /core/java/android/pim | |
| parent | aaf15ecb9078a6287c7deaf0e0225a85f70a7bd5 (diff) | |
| download | frameworks_base-01f4385d86537cf656cfc70ea075177d50619206.zip frameworks_base-01f4385d86537cf656cfc70ea075177d50619206.tar.gz frameworks_base-01f4385d86537cf656cfc70ea075177d50619206.tar.bz2 | |
Handle the string "default" and ignore it appropriately.
Diffstat (limited to 'core/java/android/pim')
| -rw-r--r-- | core/java/android/pim/vcard/VCardConfig.java | 4 |
1 files changed, 3 insertions, 1 deletions
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<String, Integer> 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; |