fix a incorrect merge (435e427d) · Commits · e / os / android_frameworks_base

core/java/android/provider/ContactsContract.java

+44 −44

Original line number	Diff line number	Diff line
		@@ -731,6 +731,34 @@ public final class ContactsContract {
		public static final String RINGTONE_URI = "data2";
		}

		/**
		* Group Membership.
		*/
		public static final class GroupMembership implements BaseCommonColumns {
		private GroupMembership() {}

		/** Mime-type used when storing this in data table. */
		public static final String CONTENT_ITEM_TYPE =
		"vnd.android.cursor.item/group_membership";

		/**
		* The row id of the group that this group membership refers to. Either this or the
		* GROUP_SOURCE_ID must be set. If they are both set then they must refer to the same
		* group.
		* <P>Type: INTEGER</P>
		*/
		public static final String GROUP_ROW_ID = "data1";

		/**
		* The source id of the group that this membership refers to. Either this or the
		* GROUP_ROW_ID must be set. If they are both set then they must refer to the same
		* group.
		* <P>Type: STRING</P>
		*/
		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.
		@@ -774,32 +802,4 @@ public final class ContactsContract {
		*/
		public static final String CONTACT_ID2 = "contact_id2";
		}

		/**
		* Group Membership.
		*/
		public static final class GroupMembership implements BaseCommonColumns {
		private GroupMembership() {}

		/** Mime-type used when storing this in data table. */
		public static final String CONTENT_ITEM_TYPE =
		"vnd.android.cursor.item/group_membership";

		/**
		* The row id of the group that this group membership refers to. Either this or the
		* GROUP_SOURCE_ID must be set. If they are both set then they must refer to the same
		* group.
		* <P>Type: INTEGER</P>
		*/
		public static final String GROUP_ROW_ID = "data1";

		/**
		* The source id of the group that this membership refers to. Either this or the
		* GROUP_ROW_ID must be set. If they are both set then they must refer to the same
		* group.
		* <P>Type: STRING</P>
		*/
		public static final String GROUP_SOURCE_ID = "data2";
		}
		}
		}