Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69c2907c authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Fix @code escapes" 

am: b0d92f47

* commit 'b0d92f47':
  Fix @code escapes
parents 79ebcde0 b0d92f47

core/java/android/annotation/BinderThread.java

+3 −3
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; 
 * on the binder thread.

 * <p>

 * Example:

 * <pre>{@code

 *  (&#64;BinderThread

 * <pre><code>

 *  &#64;BinderThread

 *  public BeamShareData createBeamShareData() { ... }

 * }</pre>

 * </code></pre>

 *

 * {@hide}

 */

core/java/android/annotation/CallSuper.java

+2 −2
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; 
 * Denotes that any overriding methods should invoke this method as well.

 * <p>

 * Example:

 * <pre>{@code

 * <pre><code>

 *  &#64;CallSuper

 *  public abstract void onFocusLost();

 * }</pre>

 * </code></pre>

 *

 * @hide

 */

core/java/android/annotation/CheckResult.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; 
 * <p>

 * Example:

 * <pre>{@code

 *  public &#64;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

core/java/android/annotation/ColorInt.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; 
 * <p>

 * Example:

 * <pre>{@code

 *  public abstract void setTextColor(&#64;ColorInt int color);

 *  public abstract void setTextColor(@ColorInt int color);

 * }</pre>

 *

 * @hide

core/java/android/annotation/FloatRange.java

+2 −2
Original line number Diff line number Diff line
@@ -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

 * <p>

 * Example:

 * <pre>{@code

 * <pre><code>

 *  &#64;FloatRange(from=0.0,to=1.0)

 *  public float getAlpha() {

 *      ...

 *  }

 * }</pre>

 * </code></pre>

 *

 * @hide

 */