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

Commit 555ef78e authored by Alan Stokes's avatar Alan Stokes Committed by android-build-merger
Browse files

Merge "Fix javadoc HTML escaping." am: 693e023b 

am: 4514c010

Change-Id: Ie13ff32fc83bfe17c90c3c52955a2ec639cf6d14
parents 769c4279 4514c010

graphics/java/android/graphics/drawable/GradientDrawable.java

+2 −2
Original line number Diff line number Diff line
@@ -579,9 +579,9 @@ public class GradientDrawable extends Drawable { 
     * The default value for this property is {@code false}.

     * <p>

     * <strong>Note</strong>: This property corresponds to the

     * {@code android:useLevel} attribute on the inner {@code &lt;gradient&gt;}

     * {@code android:useLevel} attribute on the inner {@code <gradient>}

     * tag, NOT the {@code android:useLevel} attribute on the outer

     * {@code &lt;shape&gt;} tag. For example,

     * {@code <shape>} tag. For example,

     * <pre>{@code

     * <shape ...>

     *     <gradient

telephony/java/android/provider/Telephony.java

+2 −2
Original line number Diff line number Diff line
@@ -1127,8 +1127,8 @@ public final class Telephony { 
             * Broadcast Action: A debug code has been entered in the dialer. This intent is

             * broadcast by the system and OEM telephony apps may need to receive these broadcasts.

             * These "secret codes" are used to activate developer menus by dialing certain codes.

             * And they are of the form {@code *#*#&lt;code&gt;#*#*}. The intent will have the data

             * URI: {@code android_secret_code://&lt;code&gt;}. It is possible that a manifest

             * And they are of the form {@code *#*#<code>#*#*}. The intent will have the data

             * URI: {@code android_secret_code://<code>}. It is possible that a manifest

             * receiver would be woken up even if it is not currently running.

             *

             * <p>Requires {@code android.Manifest.permission#CONTROL_INCALL_EXPERIENCE} to

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2762,8 +2762,8 @@ public class TelephonyManager { 
     * (see {@link #hasCarrierPrivileges}).

     * <p>

     * These "secret codes" are used to activate developer menus by dialing certain codes.

     * And they are of the form {@code *#*#&lt;code&gt;#*#*}. The intent will have the data

     * URI: {@code android_secret_code://&lt;code&gt;}. It is possible that a manifest

     * And they are of the form {@code *#*#<code>#*#*}. The intent will have the data

     * URI: {@code android_secret_code://<code>}. It is possible that a manifest

     * receiver would be woken up even if it is not currently running.

     * <p>

     * It is supposed to replace {@link android.provider.Telephony.Sms.Intents#SECRET_CODE_ACTION}