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

Commit ff547a59 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android Git Automerger
Browse files

am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread 

Merge commit '88bff62c' into gingerbread-plus-aosp

* commit '88bff62c':
  Fix vCard so that it looks at IM correctly.
parents 28060c8a 88bff62c

core/java/android/pim/vcard/VCardEntry.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -954,7 +954,7 @@ public class VCardEntry { 
                }

                }

            }

            }

            if (type < 0) {

            if (type < 0) {

                type = Phone.TYPE_HOME;

                type = Im.TYPE_HOME;

            }

            }

            addIm(protocol, null, type, propValue, isPrimary);

            addIm(protocol, null, type, propValue, isPrimary);

        } else if (propName.equals(VCardConstants.PROPERTY_NOTE)) {

        } else if (propName.equals(VCardConstants.PROPERTY_NOTE)) {
@@ -1195,12 +1195,14 @@ public class VCardEntry { 
                builder.withValue(Data.MIMETYPE, Im.CONTENT_ITEM_TYPE);

                builder.withValue(Data.MIMETYPE, Im.CONTENT_ITEM_TYPE);

                builder.withValue(Im.TYPE, imData.type);

                builder.withValue(Im.TYPE, imData.type);

                builder.withValue(Im.PROTOCOL, imData.protocol);

                builder.withValue(Im.PROTOCOL, imData.protocol);

                builder.withValue(Im.DATA, imData.data);

                if (imData.protocol == Im.PROTOCOL_CUSTOM) {

                if (imData.protocol == Im.PROTOCOL_CUSTOM) {

                    builder.withValue(Im.CUSTOM_PROTOCOL, imData.customProtocol);

                    builder.withValue(Im.CUSTOM_PROTOCOL, imData.customProtocol);

                }

                }

                if (imData.isPrimary) {

                if (imData.isPrimary) {

                    builder.withValue(Data.IS_PRIMARY, 1);

                    builder.withValue(Data.IS_PRIMARY, 1);

                }

                }

                operationList.add(builder.build());

            }

            }

        }

        }