am dfe07a85: am 0100fae1: Merge change I1f7c409e into eclair

Merge commit 'dfe07a850b1125f660cf8c73fdbf0a18df4f58e4'

* commit 'dfe07a850b1125f660cf8c73fdbf0a18df4f58e4':
  Make ContactStruct handle Collection properly.
This commit is contained in:
Daisuke Miyakawa
2009-10-01 12:19:15 -07:00
committed by Android Git Automerger

View File

@@ -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.