Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix javadoc HTML escaping."

Browse Source 
am: 693e023bac

Change-Id: I038bdae560fe93b75054004e00358da7cb752ff0
This commit is contained in:
Alan Stokes
2019-03-04 08:38:03 -08:00
committed by android-build-merger
parent 08bc717117 693e023bac
commit 4514c01068
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/drawable/GradientDrawable.java
View File

@@ -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

4
telephony/java/android/provider/Telephony.java
View File

@@ -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

4
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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}