summaryrefslogtreecommitdiffstats
path: root/core/java/android/pim
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2009-09-30 14:25:48 -0700
committerDaisuke Miyakawa <dmiyakawa@google.com>2009-09-30 14:25:48 -0700
commit1f7c409edc9360f1beb1dba7af69aca7eb2151fa (patch)
tree0d53b400b4fb552f3a1a3114e0bd2ba7a753aee6 /core/java/android/pim
parent285f242214d38352b844898edffc8eb336d0c19e (diff)
downloadframeworks_base-1f7c409edc9360f1beb1dba7af69aca7eb2151fa.zip
frameworks_base-1f7c409edc9360f1beb1dba7af69aca7eb2151fa.tar.gz
frameworks_base-1f7c409edc9360f1beb1dba7af69aca7eb2151fa.tar.bz2
Make ContactStruct handle Collection properly.
Internal Issue number: 2157922
Diffstat (limited to 'core/java/android/pim')
-rw-r--r--core/java/android/pim/vcard/ContactStruct.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/pim/vcard/ContactStruct.java b/core/java/android/pim/vcard/ContactStruct.java
index e87c796..a078f15 100644
--- a/core/java/android/pim/vcard/ContactStruct.java
+++ b/core/java/android/pim/vcard/ContactStruct.java
@@ -810,7 +810,8 @@ public class ContactStruct {
} else if (propName.equals("NICKNAME") || propName.equals("X-NICKNAME")) {
addNickName(propValue);
} else if (propName.equals("SOUND")) {
- if (Constants.ATTR_TYPE_X_IRMC_N.equals(paramMap.get(Constants.ATTR_TYPE))) {
+ Collection<String> typeCollection = paramMap.get(Constants.ATTR_TYPE);
+ if (typeCollection != null && typeCollection.contains(Constants.ATTR_TYPE_X_IRMC_N)) {
handlePhoneticNameFromSound(propValueList);
} else {
// Ignore this field since Android cannot understand what it is.