Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

* commit '88bff62c35e570a0c86eb55ded79d4600730226b':
  Fix vCard so that it looks at IM correctly.
This commit is contained in:
Daisuke Miyakawa
2010-08-24 13:39:42 -07:00
committed by Android Git Automerger
parent 28060c8a80 88bff62c35
commit ff547a5949
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/pim/vcard/VCardEntry.java
View File

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