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

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

Merge change I9c45753b into eclair 

* changes:
  Clean up vCard code.
parents ac35dc47 a2ba9a19

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

+2 −2
Original line number Diff line number Diff line
@@ -1051,8 +1051,8 @@ public class ContactStruct { 
            List<String> nameList;

            switch (VCardConfig.getNameOrderType(mVCardType)) {

            case VCardConfig.NAME_ORDER_JAPANESE:

                if (VCardUtils.containsOnlyAscii(mFamilyName) &&

                        VCardUtils.containsOnlyAscii(mGivenName)) {

                if (VCardUtils.containsOnlyPrintableAscii(mFamilyName) &&

                        VCardUtils.containsOnlyPrintableAscii(mGivenName)) {

                    nameList = Arrays.asList(mPrefix, mGivenName, mMiddleName, mFamilyName, mSuffix);

                } else {

                    nameList = Arrays.asList(mPrefix, mFamilyName, mMiddleName, mGivenName, mSuffix);

core/java/android/pim/vcard/VCardComposer.java

+349 −229

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/pim/vcard/VCardUtils.java

+25 −3

File changed.

Preview size limit exceeded, changes collapsed.