From 1f7c409edc9360f1beb1dba7af69aca7eb2151fa Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Wed, 30 Sep 2009 14:25:48 -0700
Subject: [PATCH] Make ContactStruct handle Collection properly.

Internal Issue number: 2157922
---
 core/java/android/pim/vcard/ContactStruct.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/pim/vcard/ContactStruct.java b/core/java/android/pim/vcard/ContactStruct.java
index e87c796e88df0..a078f15fe2f7f 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.