Merge "Updated documentation for upcoming fix for @code tags"
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
index 63adcd0..6f4144b 100644
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -1253,14 +1253,14 @@
* concurrent use.
*
* <p>An absolute hierarchical URI reference follows the pattern:
- * {@code <scheme>://<authority><absolute path>?<query>#<fragment>}
+ * {@code <scheme>://<authority><absolute path>?<query>#<fragment>}
*
* <p>Relative URI references (which are always hierarchical) follow one
- * of two patterns: {@code <relative or absolute path>?<query>#<fragment>}
- * or {@code //<authority><absolute path>?<query>#<fragment>}
+ * of two patterns: {@code <relative or absolute path>?<query>#<fragment>}
+ * or {@code //<authority><absolute path>?<query>#<fragment>}
*
* <p>An opaque URI follows this pattern:
- * {@code <scheme>:<opaque part>#<fragment>}
+ * {@code <scheme>:<opaque part>#<fragment>}
*/
public static final class Builder {
diff --git a/core/java/android/speech/SpeechRecognizer.java b/core/java/android/speech/SpeechRecognizer.java
index 8fa0d59..cd73ba8 100644
--- a/core/java/android/speech/SpeechRecognizer.java
+++ b/core/java/android/speech/SpeechRecognizer.java
@@ -50,7 +50,7 @@
private static final String TAG = "SpeechRecognizer";
/**
- * Used to retrieve an {@code ArrayList<String>} from the {@link Bundle} passed to the
+ * Used to retrieve an {@code ArrayList<String>} from the {@link Bundle} passed to the
* {@link RecognitionListener#onResults(Bundle)} and
* {@link RecognitionListener#onPartialResults(Bundle)} methods. These strings are the possible
* recognition results, where the first element is the most likely candidate.
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 682319f..9597d8c 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -117,7 +117,7 @@
* <pre><uses-permission android:name="android.permission.INTERNET" /></pre>
*
* <p>This must be a child of the <a
- * href="{@docRoot}guide/topics/manifest/manifest-element.html">{@code <manifest>}</a>
+ * href="{@docRoot}guide/topics/manifest/manifest-element.html">{@code <manifest>}</a>
* element.</p>
*
* <p>See the <a href="{@docRoot}resources/tutorials/views/hello-webview.html">Web View
@@ -140,7 +140,7 @@
* </pre>
* <p>See {@link android.content.Intent} for more information.</p>
*
- * <p>To provide a WebView in your own Activity, include a {@code <WebView>} in your layout,
+ * <p>To provide a WebView in your own Activity, include a {@code <WebView>} in your layout,
* or set the entire Activity window as a WebView during {@link
* android.app.Activity#onCreate(Bundle) onCreate()}:</p>
* <pre class="prettyprint">
@@ -287,7 +287,7 @@
* low density screens scale down. This is also the default behavior.</li>
* <li>{@code low-dpi} - Use ldpi as the target dpi. Medium and high density screens scale up
* as appropriate.</li>
- * <li><em>{@code <value>}</em> - Specify a dpi value to use as the target dpi (accepted
+ * <li><em>{@code <value>}</em> - Specify a dpi value to use as the target dpi (accepted
* values are 70-400).</li>
* </ul>
* <p>Here's an example meta tag to specify the target density:</p>
diff --git a/core/java/android/widget/ImageButton.java b/core/java/android/widget/ImageButton.java
index 12a68db..d680fad 100644
--- a/core/java/android/widget/ImageButton.java
+++ b/core/java/android/widget/ImageButton.java
@@ -32,7 +32,7 @@
* {@link android.widget.Button}, with the standard button background
* that changes color during different button states. The image on the surface
* of the button is defined either by the {@code android:src} attribute in the
- * {@code <ImageButton>} XML element or by the
+ * {@code <ImageButton>} XML element or by the
* {@link #setImageResource(int)} method.</p>
*
* <p>To remove the standard button background image, define your own
@@ -57,7 +57,7 @@
* based on the state of the button and the corresponding images
* defined in the XML.</p>
*
- * <p>The order of the {@code <item>} elements is important because they are
+ * <p>The order of the {@code <item>} elements is important because they are
* evaluated in order. This is why the "normal" button image comes last, because
* it will only be applied after {@code android:state_pressed} and {@code
* android:state_focused} have both evaluated false.</p>
diff --git a/core/java/com/android/internal/util/TypedProperties.java b/core/java/com/android/internal/util/TypedProperties.java
index c2ce210..5613999 100644
--- a/core/java/com/android/internal/util/TypedProperties.java
+++ b/core/java/com/android/internal/util/TypedProperties.java
@@ -412,7 +412,7 @@
*/
/**
- * An unchecked exception that is thrown if a {@code get<TYPE>()} method
+ * An unchecked exception that is thrown if a {@code get<TYPE>()} method
* is used to retrieve a parameter whose type does not match the method name.
*/
public static class TypeException extends IllegalArgumentException {
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 8b02355..6ecc511 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -913,7 +913,7 @@
* of {@code 0} isn't really a plugged type, but rather an indication that the
* device isn't plugged in at all, there is no bit value corresponding to a
* {@code pluggedType} value of {@code 0}. That is why we shift by
- * {@code pluggedType — 1} instead of by {@code pluggedType}.
+ * {@code pluggedType - 1} instead of by {@code pluggedType}.
* @param stayAwakeConditions a bit string specifying which "plugged types" should
* keep the device (and hence Wi-Fi) awake.
* @param pluggedType the type of plug (USB, AC, or none) for which the check is
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 559be85..ca4f29f 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -216,7 +216,7 @@
/**
* The network's SSID. Can either be an ASCII string,
* which must be enclosed in double quotation marks
- * (e.g., {@code "MyNetwork"}, or a string of
+ * (e.g., {@code "MyNetwork"}, or a string of
* hex digits,which are not enclosed in quotes
* (e.g., {@code 01a243f405}).
*/
@@ -239,7 +239,7 @@
public String preSharedKey;
/**
* Up to four WEP keys. Either an ASCII string enclosed in double
- * quotation marks (e.g., {@code "abcdef"} or a string
+ * quotation marks (e.g., {@code "abcdef"} or a string
* of hex digits (e.g., {@code 0102030405}).
* <p/>
* When the value of one of these keys is read, the actual key is