Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0100fae1 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I1f7c409e into eclair 

* changes:
  Make ContactStruct handle Collection properly.
parents 17d262f2 1f7c409e

core/java/android/pim/vcard/ContactStruct.java

+2 −1
Original line number Diff line number Diff line
@@ -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.