ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge change 27286 into eclair

Browse Source 
* changes:
  Don't send DisplayName to CP2 from Exchange contacts sync
This commit is contained in:
Android (Google) Code Review 2009-09-27 15:59:03 -04:00
commit a4cc0006f1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/exchange/adapter/ContactsSyncAdapter.java
View File

@ -1190,7 +1190,7 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
cvCompareString(cv, StructuredName.PREFIX, prefix) && cvCompareString(cv, StructuredName.PREFIX, prefix) &&
cvCompareString(cv, StructuredName.PHONETIC_GIVEN_NAME, yomiFirstName) && cvCompareString(cv, StructuredName.PHONETIC_GIVEN_NAME, yomiFirstName) &&
cvCompareString(cv, StructuredName.PHONETIC_FAMILY_NAME, yomiLastName) && cvCompareString(cv, StructuredName.PHONETIC_FAMILY_NAME, yomiLastName) &&
cvCompareString(cv, StructuredName.DISPLAY_NAME, fileAs) && //cvCompareString(cv, StructuredName.DISPLAY_NAME, fileAs) &&
cvCompareString(cv, StructuredName.SUFFIX, suffix)) { cvCompareString(cv, StructuredName.SUFFIX, suffix)) {
return; return;
} }
@ -1201,7 +1201,7 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
builder.withValue(StructuredName.PHONETIC_GIVEN_NAME, yomiFirstName); builder.withValue(StructuredName.PHONETIC_GIVEN_NAME, yomiFirstName);
builder.withValue(StructuredName.PHONETIC_FAMILY_NAME, yomiLastName); builder.withValue(StructuredName.PHONETIC_FAMILY_NAME, yomiLastName);
builder.withValue(StructuredName.PREFIX, prefix); builder.withValue(StructuredName.PREFIX, prefix);
builder.withValue(StructuredName.DISPLAY_NAME, fileAs); //builder.withValue(StructuredName.DISPLAY_NAME, fileAs);
add(builder.build()); add(builder.build());
} }