diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 2bbf5f94f9769..f32ab00e742f6 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -731,50 +731,6 @@ public final class ContactsContract { public static final String RINGTONE_URI = "data2"; } - /** - * Constants for the contact aggregation exceptions table, which contains - * aggregation rules overriding those used by automatic aggregation. - */ - public static final class AggregationExceptions { - /** - * This utility class cannot be instantiated - */ - private AggregationExceptions() {} - - /** - * The content:// style URI for this table - */ - public static final Uri CONTENT_URI = - Uri.withAppendedPath(AUTHORITY_URI, "aggregation_exceptions"); - - /** - * The MIME type of {@link #CONTENT_URI} providing a directory of data. - */ - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/aggregation_exception"; - - /** - * The type of exception: {@link #TYPE_NEVER_MATCH} or {@link #TYPE_ALWAYS_MATCH}. - * - *
Type: INTEGER
- */ - public static final String TYPE = "type"; - - public static final int TYPE_NEVER_MATCH = 0; - public static final int TYPE_ALWAYS_MATCH = 1; - - /** - * A reference to the {@link android.provider.ContactsContract.Contacts#_ID} of one of - * the contacts that the rule applies to. - */ - public static final String CONTACT_ID1 = "contact_id1"; - - /** - * A reference to the {@link android.provider.ContactsContract.Contacts#_ID} of the other - * contact that the rule applies to. - */ - public static final String CONTACT_ID2 = "contact_id2"; - } - /** * Group Membership. */ @@ -802,4 +758,48 @@ public final class ContactsContract { public static final String GROUP_SOURCE_ID = "data2"; } } + + /** + * Constants for the contact aggregation exceptions table, which contains + * aggregation rules overriding those used by automatic aggregation. + */ + public static final class AggregationExceptions { + /** + * This utility class cannot be instantiated + */ + private AggregationExceptions() {} + + /** + * The content:// style URI for this table + */ + public static final Uri CONTENT_URI = + Uri.withAppendedPath(AUTHORITY_URI, "aggregation_exceptions"); + + /** + * The MIME type of {@link #CONTENT_URI} providing a directory of data. + */ + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/aggregation_exception"; + + /** + * The type of exception: {@link #TYPE_NEVER_MATCH} or {@link #TYPE_ALWAYS_MATCH}. + * + *Type: INTEGER
+ */ + public static final String TYPE = "type"; + + public static final int TYPE_NEVER_MATCH = 0; + public static final int TYPE_ALWAYS_MATCH = 1; + + /** + * A reference to the {@link android.provider.ContactsContract.Contacts#_ID} of one of + * the contacts that the rule applies to. + */ + public static final String CONTACT_ID1 = "contact_id1"; + + /** + * A reference to the {@link android.provider.ContactsContract.Contacts#_ID} of the other + * contact that the rule applies to. + */ + public static final String CONTACT_ID2 = "contact_id2"; + } }