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

Merge "Fix vCard so that it looks at IM correctly." into gingerbread

Browse Source
This commit is contained in:
Daisuke Miyakawa
2010-08-24 13:37:02 -07:00
committed by Android (Google) Code Review
parent 6dd19ca5cb 4a2a2eb4cb
commit 88bff62c35
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) {
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());
}
}