Merge "cherry-pick from pi-dev docs: Fixing malformed javadoc" (04ac23c7) · Commits · e / os / android_frameworks_base

core/java/android/app/slice/SliceProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@ public abstract class SliceProvider extends ContentProvider {
		*
		* @param sliceUri Uri to bind.
		* @param supportedSpecs List of supported specs.
		* @see Slice.
		* @see Slice
		* @see Slice#HINT_PARTIAL
		*/
		public Slice onBindSlice(Uri sliceUri, Set<SliceSpec> supportedSpecs) {

core/java/android/content/ContentProvider.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -1182,12 +1182,12 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		* Implement this to handle query requests where the arguments are packed into a {@link Bundle}.
		* Arguments may include traditional SQL style query arguments. When present these
		* should be handled according to the contract established in
		* {@link #query(Uri, String[], String, String[], String, CancellationSignal).
		* {@link #query(Uri, String[], String, String[], String, CancellationSignal)}.
		*
		* <p>Traditional SQL arguments can be found in the bundle using the following keys:
		* <li>{@link ContentResolver#QUERY_ARG_SQL_SELECTION}
		* <li>{@link ContentResolver#QUERY_ARG_SQL_SELECTION_ARGS}
		* <li>{@link ContentResolver#QUERY_ARG_SQL_SORT_ORDER}
		* <li>{@link android.content.ContentResolver#QUERY_ARG_SQL_SELECTION}
		* <li>{@link android.content.ContentResolver#QUERY_ARG_SQL_SELECTION_ARGS}
		* <li>{@link android.content.ContentResolver#QUERY_ARG_SQL_SORT_ORDER}
		*
		* <p>This method can be called from multiple threads, as described in
		* <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
		@@ -1244,8 +1244,8 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall

		return cursor;</pre>
		* <p>
		* @see #query(Uri, String[], String, String[], String, CancellationSignal) for
		* implementation details.
		* See {@link #query(Uri, String[], String, String[], String, CancellationSignal)}
		* for implementation details.
		*
		* @param uri The URI to query. This will be the full URI sent by the client.
		* @param projection The list of columns to put into the cursor.

core/java/android/text/style/ImageSpan.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,8 @@ public class ImageSpan extends DynamicDrawableSpan {
		* Returns the source string that was saved during construction.
		*
		* @return the source string that was saved during construction
		* @see #ImageSpan(Drawable, String) and this{@link #ImageSpan(Context, Uri)}
		* @see #ImageSpan(Drawable, String)
		* @see #ImageSpan(Context, Uri)
		*/
		@Nullable
		public String getSource() {