Merge "docs: Removed dates in obsolete field messages." into qt-dev (45855214) · Commits · e / os / android_frameworks_base

core/java/android/provider/ContactsContract.java

+46 −42

Original line number	Original line	Diff line number	Diff line
	@@ -870,8 +870,8 @@ public final class ContactsContract {
	protected interface ContactOptionsColumns {		protected interface ContactOptionsColumns {
	/**		/**
	* The number of times a contact has been contacted.		* The number of times a contact has been contacted.
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field is obsolete. For		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
	* more information, see the		* this field is obsolete, regardless of Android version. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.</p>		* page.</p>
	* <P>Type: INTEGER</P>		* <P>Type: INTEGER</P>
	@@ -885,8 +885,8 @@ public final class ContactsContract {

	/**		/**
	* The last time a contact was contacted.		* The last time a contact was contacted.
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field is obsolete. For		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
	* more information, see the		* this field is obsolete, regardless of Android version. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.</p>		* page.</p>
	* <P>Type: INTEGER</P>		* <P>Type: INTEGER</P>
	@@ -1691,10 +1691,10 @@ public final class ContactsContract {
	* TIMES_CONTACTED field is incremented by 1 and the LAST_TIME_CONTACTED		* TIMES_CONTACTED field is incremented by 1 and the LAST_TIME_CONTACTED
	* field is populated with the current system time.		* field is populated with the current system time.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this method is obsolete. For		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
	* more information, see the		* this field is obsolete, regardless of Android version. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.</p>
	*		*
	* @param resolver the ContentResolver to use		* @param resolver the ContentResolver to use
	* @param contactId the person who was contacted		* @param contactId the person who was contacted
	@@ -1730,8 +1730,8 @@ public final class ContactsContract {
	* Frequent contacts are no longer included in the result as of		* Frequent contacts are no longer included in the result as of
	* Android version {@link android.os.Build.VERSION_CODES#Q}.		* Android version {@link android.os.Build.VERSION_CODES#Q}.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer sorts		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store, this
	* results based on contacts frequency. For more information, see the		* field doesn't sort results based on contacts frequency. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.
	*/		*/
	@@ -1745,8 +1745,8 @@ public final class ContactsContract {
	* Android version {@link android.os.Build.VERSION_CODES#Q}.		* Android version {@link android.os.Build.VERSION_CODES#Q}.
	* This URI always returns an empty cursor.		* This URI always returns an empty cursor.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer sorts		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store, this
	* results based on contacts frequency. For more information, see the		* field doesn't sort results based on contacts frequency. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.
	*/		*/
	@@ -1760,8 +1760,8 @@ public final class ContactsContract {
	* various parts of the contact name. The filter argument should be passed		* various parts of the contact name. The filter argument should be passed
	* as an additional path segment after this URI.		* as an additional path segment after this URI.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer sorts		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store, this
	* results based on contacts frequency. For more information, see the		* field doesn't sort results based on contacts frequency. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.
	*/		*/
	@@ -4292,10 +4292,10 @@ public final class ContactsContract {
	* Android version {@link android.os.Build.VERSION_CODES#Q}.		* Android version {@link android.os.Build.VERSION_CODES#Q}.
	* This column always contains 0.		* This column always contains 0.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field is obsolete.		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
	* For more information, see the		* this field is obsolete, regardless of Android version. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.</p>
	*/		*/
	@Deprecated		@Deprecated
	public static final String LAST_TIME_USED = "last_time_used";		public static final String LAST_TIME_USED = "last_time_used";
	@@ -4306,10 +4306,10 @@ public final class ContactsContract {
	* Android version {@link android.os.Build.VERSION_CODES#Q}.		* Android version {@link android.os.Build.VERSION_CODES#Q}.
	* This column always contains 0.		* This column always contains 0.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field is obsolete.		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
	* For more information, see the		* this field is obsolete, regardless of Android version. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.</p>
	*/		*/
	@Deprecated		@Deprecated
	public static final String TIMES_USED = "times_used";		public static final String TIMES_USED = "times_used";
	@@ -5259,8 +5259,8 @@ public final class ContactsContract {
	/**		/**
	* The content:// style URI for this table.		* The content:// style URI for this table.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store, this
	* sorts results based on contacts frequency. For more information, see the		* field doesn't sort results based on contacts frequency. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.
	*		*
	@@ -5277,8 +5277,8 @@ public final class ContactsContract {
	/**		/**
	* <p>URI used for the "enterprise caller-id".</p>		* <p>URI used for the "enterprise caller-id".</p>
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store, this
	* sorts results based on contacts frequency. For more information, see the		* field doesn't sort results based on contacts frequency. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.
	*		*
	@@ -6079,8 +6079,8 @@ public final class ContactsContract {
	* to display names as well as phone numbers. The filter argument should be passed		* to display names as well as phone numbers. The filter argument should be passed
	* as an additional path segment after this URI.		* as an additional path segment after this URI.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer		* <p class="caution"><b>Caution: </b>This field deosn't sort results based on contacts
	* sorts results based on contacts frequency. For more information, see the		* frequency. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.
	*/		*/
	@@ -6092,8 +6092,9 @@ public final class ContactsContract {
	* same columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in		* same columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in
	* parameters, otherwise it will throw IllegalArgumentException.		* parameters, otherwise it will throw IllegalArgumentException.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer sorts		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
	* results based on contacts frequency. For more information, see the		* this field doesn't sort results based on contacts frequency. For more information,
			* see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.
	*/		*/
	@@ -6360,8 +6361,9 @@ public final class ContactsContract {
	* as an additional path segment after this URI.		* as an additional path segment after this URI.
	* </p>		* </p>
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer sorts		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
	* results based on contacts frequency. For more information, see the		* this field doesn't sort results based on contacts frequency. For more information,
			* see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.</p>		* page.</p>
	*		*
	@@ -6383,8 +6385,9 @@ public final class ContactsContract {
	* same columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in		* same columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in
	* parameters, otherwise it will throw IllegalArgumentException.		* parameters, otherwise it will throw IllegalArgumentException.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
	* sorts results based on contacts frequency. For more information, see the		* this field doesn't sort results based on contacts frequency. For more information,
			* see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.
	*/		*/
	@@ -7602,8 +7605,8 @@ public final class ContactsContract {
	* <p>Similar to {@link Phone#CONTENT_FILTER_URI}, but allows users to filter callable		* <p>Similar to {@link Phone#CONTENT_FILTER_URI}, but allows users to filter callable
	* data.		* data.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer		* <p class="caution"><b>Caution: </b>This field no longer sorts results based on
	* sorts results based on contacts frequency. For more information, see the		* contacts frequency. For more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.
	*/		*/
	@@ -7615,8 +7618,9 @@ public final class ContactsContract {
	* callable data. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in		* callable data. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in
	* parameters, otherwise it will throw IllegalArgumentException.		* parameters, otherwise it will throw IllegalArgumentException.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
	* sorts results based on contacts frequency. For more information, see the		* this field doesn't sort results based on contacts frequency. For more information,
			* see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.</p>		* page.</p>
	*/		*/
	@@ -7646,8 +7650,9 @@ public final class ContactsContract {
	* <p>The content:// style URI for these data items, which allows for a query parameter		* <p>The content:// style URI for these data items, which allows for a query parameter
	* to be appended onto the end to filter for data items matching the query.		* to be appended onto the end to filter for data items matching the query.
	*		*
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this field no longer		* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
	* sorts results based on contacts frequency. For more information, see the		* this field doesn't sort results based on contacts frequency. For more information,
			* see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>		* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.		* page.
	*/		*/
	@@ -8298,15 +8303,14 @@ public final class ContactsContract {
	}		}

	/**		/**
	* <p class="caution"><b>Caution: </b>As of January 7, 2019, this class is obsolete. For
	* more information, see the
	* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
	* page.
	* </p>
	* <p>		* <p>
	* API allowing applications to send usage information for each {@link Data} row to the		* API allowing applications to send usage information for each {@link Data} row to the
	* Contacts Provider. Applications can also clear all usage information.		* Contacts Provider. Applications can also clear all usage information.
	* </p>		* </p>
			* <p class="caution"><b>Caution: </b>If you publish your app to the Google Play Store,
			* this field is obsolete, regardless of Android version. For more information, see the
			* <a href="/guide/topics/providers/contacts-provider#ObsoleteData">Contacts Provider</a>
			* page.</p>
	* <p>		* <p>
	* With the feedback, Contacts Provider may return more contextually appropriate results for		* With the feedback, Contacts Provider may return more contextually appropriate results for
	* Data listing, typically supplied with		* Data listing, typically supplied with