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

Merge change 24039 into eclair

Browse Source 
* changes:
  Fixing a concurrency problem by changing the contact aggregation exception API.
This commit is contained in:
Android (Google) Code Review
2009-09-04 18:30:46 -07:00
parent ac67ebe667 84ba06586b
commit 9cc1817d46
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/java/android/provider/ContactsContract.java
View File

@@ -1594,7 +1594,7 @@ public final class ContactsContract {
"vnd.android.cursor.item/aggregation_exception"; "vnd.android.cursor.item/aggregation_exception";
/** /**
* The type of exception: {@link #TYPE_KEEP_IN}, {@link #TYPE_KEEP_OUT} or * The type of exception: {@link #TYPE_KEEP_TOGETHER}, {@link #TYPE_KEEP_SEPARATE} or
* {@link #TYPE_AUTOMATIC}. * {@link #TYPE_AUTOMATIC}.
* *
* <P>Type: INTEGER</P> * <P>Type: INTEGER</P>
@@ -1602,33 +1602,45 @@ public final class ContactsContract {
public static final String TYPE = "type"; public static final String TYPE = "type";
/** /**
* Allows the provider to automatically decide whether the aggregate * Allows the provider to automatically decide whether the specified raw contacts should
* contact should include a particular raw contact or not. * be included in the same aggregate contact or not.
*/ */
public static final int TYPE_AUTOMATIC = 0; public static final int TYPE_AUTOMATIC = 0;
/** /**
* Makes sure that the specified raw contact is included in the * Makes sure that the specified raw contacts are included in the same
* specified aggregate contact. * aggregate contact.
*/ */
public static final int TYPE_KEEP_TOGETHER = 1;
@Deprecated
public static final int TYPE_KEEP_IN = 1; public static final int TYPE_KEEP_IN = 1;
/** /**
* Makes sure that the specified raw contact is NOT included in the * Makes sure that the specified raw contacts are NOT included in the same
* specified aggregate contact. * aggregate contact.
*/ */
public static final int TYPE_KEEP_SEPARATE = 2;
@Deprecated
public static final int TYPE_KEEP_OUT = 2; public static final int TYPE_KEEP_OUT = 2;
/** @Deprecated
* A reference to the {@link android.provider.ContactsContract.Contacts#_ID} of the
* aggregate contact that the rule applies to.
*/
public static final String CONTACT_ID = "contact_id"; public static final String CONTACT_ID = "contact_id";
@Deprecated
public static final String RAW_CONTACT_ID = "raw_contact_id";
/** /**
* A reference to the {@link RawContacts#_ID} of the raw contact that the rule applies to. * A reference to the {@link RawContacts#_ID} of the raw contact that the rule applies to.
*/ */
public static final String RAW_CONTACT_ID = "raw_contact_id"; public static final String RAW_CONTACT_ID1 = "raw_contact_id1";
/**
* A reference to the other {@link RawContacts#_ID} of the raw contact that the rule
* applies to.
*/
public static final String RAW_CONTACT_ID2 = "raw_contact_id2";
} }
private interface SettingsColumns { private interface SettingsColumns {