summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrew Solovay <asolovay@google.com> 2018-12-14 10:50:44 -0800
committer android-build-merger <android-build-merger@google.com> 2018-12-14 10:50:44 -0800
commitad7477b1925bf20ad1f0c8cb1c67d28bebc64b90 (patch)
treeabe001ab8479f9908f9593aeaf113fe6e12f5bb9
parent4f7956f58ca861f598c44299786d8389f37d97bf (diff)
parent6eaf48ea5720a901249dddd390b78e6a1efe14aa (diff)
docs: Fixing malformed javadoc
am: 6eaf48ea57 Change-Id: Idf8415ee4fb85e52d74e1f8bec8d0e2f8d1f58f1
-rw-r--r--core/java/android/app/slice/Slice.java16
-rw-r--r--core/java/android/app/slice/SliceProvider.java2
-rw-r--r--core/java/android/content/ContentProvider.java12
-rw-r--r--core/java/android/text/style/ImageSpan.java3
4 files changed, 17 insertions, 16 deletions
diff --git a/core/java/android/app/slice/Slice.java b/core/java/android/app/slice/Slice.java
index e54d3b64f780..d1aec048bdf1 100644
--- a/core/java/android/app/slice/Slice.java
+++ b/core/java/android/app/slice/Slice.java
@@ -425,7 +425,7 @@ public final class Slice implements Parcelable {
/**
* Add a sub-slice to the slice being constructed
* @param subType Optional template-specific type information
- * @see {@link SliceItem#getSubType()}
+ * @see SliceItem#getSubType()
*/
public Builder addSubSlice(@NonNull Slice slice, @Nullable @SliceSubtype String subType) {
Preconditions.checkNotNull(slice);
@@ -437,7 +437,7 @@ public final class Slice implements Parcelable {
/**
* Add an action to the slice being constructed
* @param subType Optional template-specific type information
- * @see {@link SliceItem#getSubType()}
+ * @see SliceItem#getSubType()
*/
public Slice.Builder addAction(@NonNull PendingIntent action, @NonNull Slice s,
@Nullable @SliceSubtype String subType) {
@@ -453,7 +453,7 @@ public final class Slice implements Parcelable {
/**
* Add text to the slice being constructed
* @param subType Optional template-specific type information
- * @see {@link SliceItem#getSubType()}
+ * @see SliceItem#getSubType()
*/
public Builder addText(CharSequence text, @Nullable @SliceSubtype String subType,
@SliceHint List<String> hints) {
@@ -464,7 +464,7 @@ public final class Slice implements Parcelable {
/**
* Add an image to the slice being constructed
* @param subType Optional template-specific type information
- * @see {@link SliceItem#getSubType()}
+ * @see SliceItem#getSubType()
*/
public Builder addIcon(Icon icon, @Nullable @SliceSubtype String subType,
@SliceHint List<String> hints) {
@@ -476,7 +476,7 @@ public final class Slice implements Parcelable {
/**
* Add remote input to the slice being constructed
* @param subType Optional template-specific type information
- * @see {@link SliceItem#getSubType()}
+ * @see SliceItem#getSubType()
*/
public Slice.Builder addRemoteInput(RemoteInput remoteInput,
@Nullable @SliceSubtype String subType,
@@ -490,7 +490,7 @@ public final class Slice implements Parcelable {
/**
* Add an integer to the slice being constructed
* @param subType Optional template-specific type information
- * @see {@link SliceItem#getSubType()}
+ * @see SliceItem#getSubType()
*/
public Builder addInt(int value, @Nullable @SliceSubtype String subType,
@SliceHint List<String> hints) {
@@ -511,7 +511,7 @@ public final class Slice implements Parcelable {
/**
* Add a long to the slice being constructed
* @param subType Optional template-specific type information
- * @see {@link SliceItem#getSubType()}
+ * @see SliceItem#getSubType()
*/
public Slice.Builder addLong(long value, @Nullable @SliceSubtype String subType,
@SliceHint List<String> hints) {
@@ -525,7 +525,7 @@ public final class Slice implements Parcelable {
* <p>Expected to be used for support library extension, should not be used for general
* development
* @param subType Optional template-specific type information
- * @see {@link SliceItem#getSubType()}
+ * @see SliceItem#getSubType()
*/
public Slice.Builder addBundle(Bundle bundle, @Nullable @SliceSubtype String subType,
@SliceHint List<String> hints) {
diff --git a/core/java/android/app/slice/SliceProvider.java b/core/java/android/app/slice/SliceProvider.java
index 4c22c94266d7..ea9c9dab21ee 100644
--- a/core/java/android/app/slice/SliceProvider.java
+++ b/core/java/android/app/slice/SliceProvider.java
@@ -209,7 +209,7 @@ public abstract class SliceProvider extends ContentProvider {
*
* @param sliceUri Uri to bind.
* @param supportedSpecs List of supported specs.
- * @see {@link Slice}.
+ * @see {@link Slice}
* @see {@link Slice#HINT_PARTIAL}
*/
public Slice onBindSlice(Uri sliceUri, Set<SliceSpec> supportedSpecs) {
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 2997e984add4..f1b8d1e46449 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -1073,12 +1073,12 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
* 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
@@ -1135,8 +1135,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
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.
diff --git a/core/java/android/text/style/ImageSpan.java b/core/java/android/text/style/ImageSpan.java
index d4edde9ec589..13ac9ff2ddaf 100644
--- a/core/java/android/text/style/ImageSpan.java
+++ b/core/java/android/text/style/ImageSpan.java
@@ -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() {