Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0100fae1: Merge change I1f7c409e into eclair

Browse Source 
Merge commit '0100fae14ff12c36eeff07b94cdea5f8756837aa' into eclair-plus-aosp

* commit '0100fae14ff12c36eeff07b94cdea5f8756837aa':
  Make ContactStruct handle Collection properly.
This commit is contained in:
Daisuke Miyakawa
2009-09-30 14:31:15 -07:00
committed by Android Git Automerger
parent e092e1f531 0100fae14f
commit dfe07a850b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/pim/vcard/ContactStruct.java
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.