diff --git a/core/java/android/annotation/BinderThread.java b/core/java/android/annotation/BinderThread.java index c69ba10bd7486..6f85e0457e0e2 100644 --- a/core/java/android/annotation/BinderThread.java +++ b/core/java/android/annotation/BinderThread.java @@ -29,10 +29,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; * on the binder thread. *
* Example: - *
{@code
- * (@BinderThread
+ *
+ * @BinderThread
* public BeamShareData createBeamShareData() { ... }
- * }
+ *
*
* {@hide}
*/
diff --git a/core/java/android/annotation/CallSuper.java b/core/java/android/annotation/CallSuper.java
index 82e27232abb67..b10a28acf7a4d 100644
--- a/core/java/android/annotation/CallSuper.java
+++ b/core/java/android/annotation/CallSuper.java
@@ -25,10 +25,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
* Denotes that any overriding methods should invoke this method as well.
* * Example: - *
{@code
+ *
* @CallSuper
* public abstract void onFocusLost();
- * }
+ *
*
* @hide
*/
diff --git a/core/java/android/annotation/CheckResult.java b/core/java/android/annotation/CheckResult.java
index 787514e9f8c3b..97d031a760a61 100644
--- a/core/java/android/annotation/CheckResult.java
+++ b/core/java/android/annotation/CheckResult.java
@@ -29,7 +29,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
* * Example: *
{@code
- * public @CheckResult String trim(String s) { return s.trim(); }
+ * public @CheckResult String trim(String s) { return s.trim(); }
* ...
* s.trim(); // this is probably an error
* s = s.trim(); // ok
diff --git a/core/java/android/annotation/ColorInt.java b/core/java/android/annotation/ColorInt.java
index 69d196c6b5e44..4671b1b9f8876 100644
--- a/core/java/android/annotation/ColorInt.java
+++ b/core/java/android/annotation/ColorInt.java
@@ -31,7 +31,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
*
* Example:
*
{@code
- * public abstract void setTextColor(@ColorInt int color);
+ * public abstract void setTextColor(@ColorInt int color);
* }
*
* @hide
diff --git a/core/java/android/annotation/FloatRange.java b/core/java/android/annotation/FloatRange.java
index 3a7c15015b498..05b51680b1b01 100644
--- a/core/java/android/annotation/FloatRange.java
+++ b/core/java/android/annotation/FloatRange.java
@@ -28,12 +28,12 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
* Denotes that the annotated element should be a float or double in the given range
*
* Example:
- *
{@code
+ *
* @FloatRange(from=0.0,to=1.0)
* public float getAlpha() {
* ...
* }
- * }
+ *
*
* @hide
*/
diff --git a/core/java/android/annotation/IntDef.java b/core/java/android/annotation/IntDef.java
index 3cae9c5228299..6b0abb66a2dd0 100644
--- a/core/java/android/annotation/IntDef.java
+++ b/core/java/android/annotation/IntDef.java
@@ -28,24 +28,24 @@ import static java.lang.annotation.RetentionPolicy.CLASS;
* multiple constants can be combined.
*
* Example:
- *
{@code
- * @Retention(CLASS)
- * @IntDef({NAVIGATION_MODE_STANDARD, NAVIGATION_MODE_LIST, NAVIGATION_MODE_TABS})
- * public @interface NavigationMode {}
+ *
+ * @Retention(SOURCE)
+ * @IntDef({NAVIGATION_MODE_STANDARD, NAVIGATION_MODE_LIST, NAVIGATION_MODE_TABS})
+ * public @interface NavigationMode {}
* public static final int NAVIGATION_MODE_STANDARD = 0;
* public static final int NAVIGATION_MODE_LIST = 1;
* public static final int NAVIGATION_MODE_TABS = 2;
* ...
- * public abstract void setNavigationMode(@NavigationMode int mode);
+ * public abstract void setNavigationMode(@NavigationMode int mode);
* @NavigationMode
* public abstract int getNavigationMode();
- * }
+ *
* For a flag, set the flag attribute:
- * {@code
+ *
* @IntDef(
* flag = true
- * value = {NAVIGATION_MODE_STANDARD, NAVIGATION_MODE_LIST, NAVIGATION_MODE_TABS})
- * }
+ * value = {NAVIGATION_MODE_STANDARD, NAVIGATION_MODE_LIST, NAVIGATION_MODE_TABS})
+ *
*
* @hide
*/
diff --git a/core/java/android/annotation/IntRange.java b/core/java/android/annotation/IntRange.java
index 1e3c072267d77..1592862b4d5fa 100644
--- a/core/java/android/annotation/IntRange.java
+++ b/core/java/android/annotation/IntRange.java
@@ -28,12 +28,12 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
* Denotes that the annotated element should be an int or long in the given range
*
* Example:
- *
{@code
+ *
* @IntRange(from=0,to=255)
* public int getAlpha() {
* ...
* }
- * }
+ *
*
* @hide
*/
diff --git a/core/java/android/annotation/MainThread.java b/core/java/android/annotation/MainThread.java
index 18a4283b2532d..52f8dfb2dbb14 100644
--- a/core/java/android/annotation/MainThread.java
+++ b/core/java/android/annotation/MainThread.java
@@ -29,10 +29,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
* on the main thread.
*
* Example:
- *
{@code
+ *
* @MainThread
* public void deliverResult(D data) { ... }
- * }
+ *
*
* {@hide}
*/
diff --git a/core/java/android/annotation/RequiresPermission.java b/core/java/android/annotation/RequiresPermission.java
index 4aed5c1e90801..a15df9cc7c0e7 100644
--- a/core/java/android/annotation/RequiresPermission.java
+++ b/core/java/android/annotation/RequiresPermission.java
@@ -29,26 +29,26 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
*
* Example of requiring a single permission:
* {@code
- * @RequiresPermission(Manifest.permission.SET_WALLPAPER)
+ * {@literal @}RequiresPermission(Manifest.permission.SET_WALLPAPER)
* public abstract void setWallpaper(Bitmap bitmap) throws IOException;
*
- * @RequiresPermission(ACCESS_COARSE_LOCATION)
+ * {@literal @}RequiresPermission(ACCESS_COARSE_LOCATION)
* public abstract Location getLastKnownLocation(String provider);
* }
* Example of requiring at least one permission from a set:
* {@code
- * @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
+ * {@literal @}RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
* public abstract Location getLastKnownLocation(String provider);
* }
* Example of requiring multiple permissions:
* {@code
- * @RequiresPermission(allOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
+ * {@literal @}RequiresPermission(allOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
* public abstract Location getLastKnownLocation(String provider);
* }
* Example of requiring separate read and write permissions for a content provider:
* {@code
- * @RequiresPermission.Read(@RequiresPermission(READ_HISTORY_BOOKMARKS))
- * @RequiresPermission.Write(@RequiresPermission(WRITE_HISTORY_BOOKMARKS))
+ * {@literal @}RequiresPermission.Read(@RequiresPermission(READ_HISTORY_BOOKMARKS))
+ * {@literal @}RequiresPermission.Write(@RequiresPermission(WRITE_HISTORY_BOOKMARKS))
* public static final Uri BOOKMARKS_URI = Uri.parse("content://browser/bookmarks");
* }
*
diff --git a/core/java/android/annotation/Size.java b/core/java/android/annotation/Size.java
index 389b819bb41af..7c3e70f658e99 100644
--- a/core/java/android/annotation/Size.java
+++ b/core/java/android/annotation/Size.java
@@ -31,7 +31,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
*
* Example:
*
{@code
- * public void getLocationInWindow(@Size(2) int[] location) {
+ * public void getLocationInWindow(@Size(2) int[] location) {
* ...
* }
* }
diff --git a/core/java/android/annotation/StringDef.java b/core/java/android/annotation/StringDef.java
index 5f7f380c40ecf..8c8d5d8794dca 100644
--- a/core/java/android/annotation/StringDef.java
+++ b/core/java/android/annotation/StringDef.java
@@ -26,20 +26,20 @@ import static java.lang.annotation.RetentionPolicy.CLASS;
* type and that its value should be one of the explicitly named constants.
*
* Example:
- *
{@code
+ *
* @Retention(SOURCE)
- * @StringDef({
+ * @StringDef({
* POWER_SERVICE,
* WINDOW_SERVICE,
* LAYOUT_INFLATER_SERVICE
- * })
- * public @interface ServiceName {}
+ * })
+ * public @interface ServiceName {}
* public static final String POWER_SERVICE = "power";
* public static final String WINDOW_SERVICE = "window";
* public static final String LAYOUT_INFLATER_SERVICE = "layout_inflater";
* ...
- * public abstract Object getSystemService(@ServiceName String name);
- * }
+ * public abstract Object getSystemService(@ServiceName String name);
+ *
*
* @hide
*/
diff --git a/core/java/android/annotation/UiThread.java b/core/java/android/annotation/UiThread.java
index b81460023112c..53121e7d532fe 100644
--- a/core/java/android/annotation/UiThread.java
+++ b/core/java/android/annotation/UiThread.java
@@ -29,10 +29,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
* on the UI thread.
*
* Example:
- *
{@code
+ *
* @UiThread
- * public abstract void setText(@NonNull String text) { ... }
- * }
+ * public abstract void setText(@NonNull String text) { ... }
+ *
*
* {@hide}
*/
diff --git a/core/java/android/annotation/WorkerThread.java b/core/java/android/annotation/WorkerThread.java
index dd12e05ed71a9..0d2c43e8fc00a 100644
--- a/core/java/android/annotation/WorkerThread.java
+++ b/core/java/android/annotation/WorkerThread.java
@@ -29,10 +29,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
* on a worker thread.
*
* Example:
- *
{@code
- * (@WorkerThread
+ *
+ * @WorkerThread
* protected abstract FilterResults performFiltering(CharSequence constraint);
- * }
+ *
*
* {@hide}
*/
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index ec262e5dc68e8..84c6d6a256d65 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -82,9 +82,9 @@ public class ActivityManager {
/**
* {@code
- * <meta-data>} name for a 'home' Activity that declares a package that is to be
+ * } name for a 'home' Activity that declares a package that is to be
* uninstalled in lieu of the declaring one. The package named here must be
- * signed with the same certificate as the one declaring the {@code <meta-data>}.
+ * signed with the same certificate as the one declaring the {@code }.
*/
public static final String META_HOME_ALTERNATE = "android.app.home.alternate";
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index f7c061a53addb..02d4e59af6e40 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -2882,8 +2882,7 @@ public class Camera {
* y for the Y plane and row c for the U and V
* planes:
*
- * {@code
- *
+ * {@code
* yStride = (int) ceil(width / 16.0) * 16;
* uvStride = (int) ceil( (yStride / 2) / 16.0) * 16;
* ySize = yStride * height;
@@ -2891,8 +2890,9 @@ public class Camera {
* yRowIndex = yStride * y;
* uRowIndex = ySize + uvSize + uvStride * c;
* vRowIndex = ySize + uvStride * c;
- * size = ySize + uvSize * 2;
+ * size = ySize + uvSize * 2;
* }
+ *
*
* @param pixel_format the desired preview picture format, defined by
* one of the {@link android.graphics.ImageFormat} constants. (E.g.,
diff --git a/core/java/android/hardware/package.html b/core/java/android/hardware/package.html
index 5b04da11e4fe0..ee54476d97b80 100644
--- a/core/java/android/hardware/package.html
+++ b/core/java/android/hardware/package.html
@@ -4,6 +4,6 @@
not all Android-powered devices support all hardware features, so you should declare hardware
that your application requires using the {@code
-<uses-feature>} manifest element.
+} manifest element.