diff options
| author | 2009-09-04 18:30:46 -0700 | |
|---|---|---|
| committer | 2009-09-04 18:30:46 -0700 | |
| commit | 9cc1817d46d8092865d8f1e7a6391dcae197a26a (patch) | |
| tree | 7e3945666b91df51790cc14e9dc60834ba0d0ca2 | |
| parent | ac67ebe667d30f3cd2e39fa57164d4f3ddaea677 (diff) | |
| parent | 84ba06586b8dc079fec476b0d39b3d71687354a0 (diff) | |
Merge change 24039 into eclair
* changes:
Fixing a concurrency problem by changing the contact aggregation exception API.
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index a175c3757a19..6e3b28242fe6 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -1594,7 +1594,7 @@ public final class ContactsContract { "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}. * * <P>Type: INTEGER</P> @@ -1602,33 +1602,45 @@ public final class ContactsContract { public static final String TYPE = "type"; /** - * Allows the provider to automatically decide whether the aggregate - * contact should include a particular raw contact or not. + * Allows the provider to automatically decide whether the specified raw contacts should + * be included in the same aggregate contact or not. */ public static final int TYPE_AUTOMATIC = 0; /** - * Makes sure that the specified raw contact is included in the - * specified aggregate contact. + * Makes sure that the specified raw contacts are included in the same + * aggregate contact. */ + public static final int TYPE_KEEP_TOGETHER = 1; + + @Deprecated public static final int TYPE_KEEP_IN = 1; /** - * Makes sure that the specified raw contact is NOT included in the - * specified aggregate contact. + * Makes sure that the specified raw contacts are NOT included in the same + * aggregate contact. */ + public static final int TYPE_KEEP_SEPARATE = 2; + + @Deprecated public static final int TYPE_KEEP_OUT = 2; - /** - * A reference to the {@link android.provider.ContactsContract.Contacts#_ID} of the - * aggregate contact that the rule applies to. - */ + @Deprecated 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. */ - 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 { |