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

am 23703f16: Merge change 26732 into eclair

Browse Source 
Merge commit '23703f16f816d4212e5a95c101a851660c095f24' into eclair-plus-aosp

* commit '23703f16f816d4212e5a95c101a851660c095f24':
  Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
This commit is contained in:
Daisuke Miyakawa
2009-09-24 01:50:35 -07:00
committed by Android Git Automerger
parent cc582a8ee1 23703f16f8
commit 3adab9fcff
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/pim/vcard/ContactStruct.java
View File

@@ -1026,8 +1026,7 @@ public class ContactStruct {
} }
} }
// From HardCodedSources.java in Contacts app. // From GoogleSource.java in Contacts app.
// TODO: fix this.
private static final String ACCOUNT_TYPE_GOOGLE = "com.google.GAIA"; private static final String ACCOUNT_TYPE_GOOGLE = "com.google.GAIA";
private static final String GOOGLE_MY_CONTACTS_GROUP = "System Group: My Contacts"; private static final String GOOGLE_MY_CONTACTS_GROUP = "System Group: My Contacts";
@@ -1041,7 +1040,8 @@ public class ContactStruct {
builder.withValue(RawContacts.ACCOUNT_NAME, mAccount.name); builder.withValue(RawContacts.ACCOUNT_NAME, mAccount.name);
builder.withValue(RawContacts.ACCOUNT_TYPE, mAccount.type); builder.withValue(RawContacts.ACCOUNT_TYPE, mAccount.type);
// TODO: temporal fix for "My Groups" issue. Need to be refactored. // Assume that caller side creates this group if it does not exist.
// TODO: refactor this code along with the change in GoogleSource.java
if (ACCOUNT_TYPE_GOOGLE.equals(mAccount.type)) { if (ACCOUNT_TYPE_GOOGLE.equals(mAccount.type)) {
final Cursor cursor = resolver.query(Groups.CONTENT_URI, new String[] { final Cursor cursor = resolver.query(Groups.CONTENT_URI, new String[] {
Groups.SOURCE_ID }, Groups.SOURCE_ID },
@@ -1058,7 +1058,8 @@ public class ContactStruct {
} }
} }
} else { } else {
builder.withValues(new ContentValues()); builder.withValue(RawContacts.ACCOUNT_NAME, null);
builder.withValue(RawContacts.ACCOUNT_TYPE, null);
} }
operationList.add(builder.build()); operationList.add(builder.build());