diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-08-24 13:37:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-24 13:37:02 -0700 |
| commit | 88bff62c35e570a0c86eb55ded79d4600730226b (patch) | |
| tree | ae4b89ce672459d72f13ecac74b3811bec324598 | |
| parent | 6dd19ca5cb78008d6793d0a223a6189786c5c62f (diff) | |
| parent | 4a2a2eb4cb7a89445a9bcb7ab6b1fe01a79429b4 (diff) | |
| download | frameworks_base-88bff62c35e570a0c86eb55ded79d4600730226b.zip frameworks_base-88bff62c35e570a0c86eb55ded79d4600730226b.tar.gz frameworks_base-88bff62c35e570a0c86eb55ded79d4600730226b.tar.bz2 | |
Merge "Fix vCard so that it looks at IM correctly." into gingerbread
| -rw-r--r-- | core/java/android/pim/vcard/VCardEntry.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/pim/vcard/VCardEntry.java b/core/java/android/pim/vcard/VCardEntry.java index 7c7e9b8..97d3fbc 100644 --- a/core/java/android/pim/vcard/VCardEntry.java +++ b/core/java/android/pim/vcard/VCardEntry.java @@ -954,7 +954,7 @@ public class VCardEntry { } } if (type < 0) { - type = Phone.TYPE_HOME; + type = Im.TYPE_HOME; } addIm(protocol, null, type, propValue, isPrimary); } else if (propName.equals(VCardConstants.PROPERTY_NOTE)) { @@ -1195,12 +1195,14 @@ public class VCardEntry { builder.withValue(Data.MIMETYPE, Im.CONTENT_ITEM_TYPE); builder.withValue(Im.TYPE, imData.type); builder.withValue(Im.PROTOCOL, imData.protocol); + builder.withValue(Im.DATA, imData.data); if (imData.protocol == Im.PROTOCOL_CUSTOM) { builder.withValue(Im.CUSTOM_PROTOCOL, imData.customProtocol); } if (imData.isPrimary) { builder.withValue(Data.IS_PRIMARY, 1); } + operationList.add(builder.build()); } } |