commit ff547a59494206a1555eafa296b68961b677ba90
author Daisuke Miyakawa <dmiyakawa@google.com> Tue Aug 24 13:39:42 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 24 13:39:42 2010 -0700
tree 9d5d366fc46159daaba512506d83a65824cfffb9
parent 28060c8a806b58fc53f281688146877e8c37a504
parent 88bff62c35e570a0c86eb55ded79d4600730226b

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

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

* commit '88bff62c35e570a0c86eb55ded79d4600730226b':
  Fix vCard so that it looks at IM correctly.

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

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 @@
                 }
             }
             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 @@
                 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());
             }
         }