am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs (b3436359) · Commits · e / os / android_frameworks_base

core/java/android/content/ClipDescription.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ public class ClipDescription implements Parcelable {
		/**
		* Helper to compare two MIME types, where one may be a pattern.
		* @param concreteType A fully-specified MIME type.
		* @param desiredType A desired MIME type that may be a pattern such as \/.
		* @param desiredType A desired MIME type that may be a pattern such as /.
		* @return Returns true if the two MIME types match.
		*/
		public static boolean compareMimeTypes(String concreteType, String desiredType) {

core/java/android/content/ContentProvider.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1328,7 +1328,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		*
		* @param uri The data in the content provider being queried.
		* @param mimeTypeFilter The type of data the client desires. May be
		* a pattern, such as \/ to retrieve all possible data types.
		* a pattern, such as / to retrieve all possible data types.
		* @return Returns {@code null} if there are no possible data streams for the
		* given mimeTypeFilter. Otherwise returns an array of all available
		* concrete MIME types.
		@@ -1366,7 +1366,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		*
		* @param uri The data in the content provider being queried.
		* @param mimeTypeFilter The type of data the client desires. May be
		* a pattern, such as \/, if the caller does not have specific type
		* a pattern, such as /, if the caller does not have specific type
		* requirements; in this case the content provider will pick its best
		* type matching the pattern.
		* @param opts Additional options from the client. The definitions of
		@@ -1427,7 +1427,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		*
		* @param uri The data in the content provider being queried.
		* @param mimeTypeFilter The type of data the client desires. May be
		* a pattern, such as \/, if the caller does not have specific type
		* a pattern, such as /, if the caller does not have specific type
		* requirements; in this case the content provider will pick its best
		* type matching the pattern.
		* @param opts Additional options from the client. The definitions of

core/java/android/content/ContentResolver.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ public abstract class ContentResolver {
		* @param url A Uri identifying content (either a list or specific type),
		* using the content:// scheme.
		* @param mimeTypeFilter The desired MIME type. This may be a pattern,
		* such as \/, to query for all available MIME types that match the
		* such as /, to query for all available MIME types that match the
		* pattern.
		* @return Returns an array of MIME type strings for all available
		* data streams that match the given mimeTypeFilter. If there are none,
		@@ -815,7 +815,7 @@ public abstract class ContentResolver {
		*
		* <p>Note that if this function is called for read-only input (mode is "r")
		* on a content: URI, it will instead call {@link #openTypedAssetFileDescriptor}
		* for you with a MIME type of "\/". This allows such callers to benefit
		* for you with a MIME type of "/". This allows such callers to benefit
		* from any built-in data conversion that a provider implements.
		*
		* @param uri The desired URI to open.
		@@ -868,7 +868,7 @@ public abstract class ContentResolver {
		*
		* <p>Note that if this function is called for read-only input (mode is "r")
		* on a content: URI, it will instead call {@link #openTypedAssetFileDescriptor}
		* for you with a MIME type of "\/". This allows such callers to benefit
		* for you with a MIME type of "/". This allows such callers to benefit
		* from any built-in data conversion that a provider implements.
		*
		* @param uri The desired URI to open.
		@@ -993,7 +993,7 @@ public abstract class ContentResolver {
		*
		* @param uri The desired URI to open.
		* @param mimeType The desired MIME type of the returned data. This can
		* be a pattern such as \/, which will allow the content provider to
		* be a pattern such as /, which will allow the content provider to
		* select a type, though there is no way for you to determine what type
		* it is returning.
		* @param opts Additional provider-dependent options.
		@@ -1026,7 +1026,7 @@ public abstract class ContentResolver {
		*
		* @param uri The desired URI to open.
		* @param mimeType The desired MIME type of the returned data. This can
		* be a pattern such as \/, which will allow the content provider to
		* be a pattern such as /, which will allow the content provider to
		* select a type, though there is no way for you to determine what type
		* it is returning.
		* @param opts Additional provider-dependent options.

core/java/android/content/Intent.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -844,7 +844,7 @@ public class Intent implements Parcelable, Cloneable {
		* {@link #FLAG_GRANT_WRITE_URI_PERMISSION}, then these flags will also be
		* set in the returned chooser intent, with its ClipData set appropriately:
		* either a direct reflection of {@link #getClipData()} if that is non-null,
		* or a new ClipData build from {@link #getData()}.
		* or a new ClipData built from {@link #getData()}.
		*
		* @param target The Intent that the user will be selecting an activity
		* to perform.
		@@ -5431,7 +5431,7 @@ public class Intent implements Parcelable, Cloneable {
		* directly used by Intent. Applications should generally rely on the
		* MIME type of the Intent itself, not what it may find in the ClipData.
		* A common practice is to construct a ClipData for use with an Intent
		* with a MIME type of "\/".
		* with a MIME type of "/".
		*
		* @param clip The new clip to set. May be null to clear the current clip.
		*/

core/java/android/os/AsyncTask.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -610,7 +610,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		* still running. Each call to this method will trigger the execution of
		* {@link #onProgressUpdate} on the UI thread.
		*
		* {@link #onProgressUpdate} will note be called if the task has been
		* {@link #onProgressUpdate} will not be called if the task has been
		* canceled.
		*
		* @param values The progress values to update the UI with.