From a45746efadd11bb7dfab026fb3c81a25fae74ca4 Mon Sep 17 00:00:00 2001 From: Jeff Smith Date: Thu, 19 Jul 2012 14:19:24 -0500 Subject: [PATCH] Fix several cases of broken droiddoc syntax external issue 35214 patch contributed by Jeff Smith Change-Id: I70dcee88a140699bf3e1ab369bed6dcd2fdd3d83 --- core/java/android/content/BroadcastReceiver.java | 2 +- core/java/android/content/pm/PackageManager.java | 2 +- core/java/android/net/DummyDataStateTracker.java | 2 +- core/java/android/net/MobileDataStateTracker.java | 2 +- core/java/android/nfc/NdefRecord.java | 2 +- core/java/android/os/storage/StorageManager.java | 2 +- core/java/android/view/SurfaceHolder.java | 6 +++--- core/java/android/view/View.java | 2 +- core/java/android/view/ViewGroup.java | 2 +- core/java/android/view/textservice/TextServicesManager.java | 8 ++++---- media/java/android/media/MediaExtractor.java | 2 +- media/java/android/media/MediaPlayer.java | 2 +- test-runner/src/android/test/MoreAsserts.java | 2 +- test-runner/src/android/test/ServiceTestCase.java | 2 +- .../DataIdleTest/src/com/android/tests/dataidle/DataIdleTest.java | 2 +- wifi/java/android/net/wifi/WifiStateMachine.java | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/core/java/android/content/BroadcastReceiver.java b/core/java/android/content/BroadcastReceiver.java index 9ddb2a6f7bd6..446f1af41177 100644 --- a/core/java/android/content/BroadcastReceiver.java +++ b/core/java/android/content/BroadcastReceiver.java @@ -735,7 +735,7 @@ public abstract class BroadcastReceiver { /** * Control inclusion of debugging help for mismatched - * calls to {@ Context#registerReceiver(BroadcastReceiver, IntentFilter) + * calls to {@link Context#registerReceiver(BroadcastReceiver, IntentFilter) * Context.registerReceiver()}. * If called with true, before given to registerReceiver(), then the * callstack of the following {@link Context#unregisterReceiver(BroadcastReceiver) diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 6de69b034acf..7e96ae6e7a8f 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1610,7 +1610,7 @@ public abstract class PackageManager { * * @param flags Additional option flags. Use any combination of * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES}, - * {link #GET_UNINSTALLED_PACKAGES} to modify the data returned. + * {@link #GET_UNINSTALLED_PACKAGES} to modify the data returned. * * @return A List of ApplicationInfo objects, one for each application that * is installed on the device. In the unlikely case of there being diff --git a/core/java/android/net/DummyDataStateTracker.java b/core/java/android/net/DummyDataStateTracker.java index 9f0f9cd3f522..ccd96ff3c0c1 100644 --- a/core/java/android/net/DummyDataStateTracker.java +++ b/core/java/android/net/DummyDataStateTracker.java @@ -123,7 +123,7 @@ public class DummyDataStateTracker implements NetworkStateTracker { * Record the detailed state of a network, and if it is a * change from the previous state, send a notification to * any listeners. - * @param state the new @{code DetailedState} + * @param state the new {@code DetailedState} * @param reason a {@code String} indicating a reason for the state change, * if one was supplied. May be {@code null}. * @param extraInfo optional {@code String} providing extra information about the state change diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index 54a89ad61dcb..57f8d48a38ce 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -376,7 +376,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { * Record the detailed state of a network, and if it is a * change from the previous state, send a notification to * any listeners. - * @param state the new @{code DetailedState} + * @param state the new {@code DetailedState} * @param reason a {@code String} indicating a reason for the state change, * if one was supplied. May be {@code null}. * @param extraInfo optional {@code String} providing extra information about the state change diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java index 887233523ca4..ed1c5b3e0f6b 100644 --- a/core/java/android/nfc/NdefRecord.java +++ b/core/java/android/nfc/NdefRecord.java @@ -70,7 +70,7 @@ import java.util.Locale; * indicate location with an NDEF message, provide support for chunking of * NDEF records, and to pack optional fields. This class does not expose * those details. To write an NDEF Record as binary you must first put it - * into an @{link NdefMessage}, then call {@link NdefMessage#toByteArray()}. + * into an {@link NdefMessage}, then call {@link NdefMessage#toByteArray()}. *

* {@link NdefMessage} and {@link NdefRecord} implementations are * always available, even on Android devices that do not have NFC hardware. diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index fbf512c843bb..cb6c1dc4cf97 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -289,7 +289,7 @@ public class StorageManager * Constructs a StorageManager object through which an application can * can communicate with the systems mount service. * - * @param tgtLooper The {@android.os.Looper} which events will be received on. + * @param tgtLooper The {@link android.os.Looper} which events will be received on. * *

Applications can get instance of this class by calling * {@link android.content.Context#getSystemService(java.lang.String)} with an argument diff --git a/core/java/android/view/SurfaceHolder.java b/core/java/android/view/SurfaceHolder.java index 2a16725ad321..015a78e0daa6 100644 --- a/core/java/android/view/SurfaceHolder.java +++ b/core/java/android/view/SurfaceHolder.java @@ -155,7 +155,7 @@ public interface SurfaceHolder { /** * Make the surface a fixed size. It will never change from this size. - * When working with a {link SurfaceView}, this must be called from the + * When working with a {@link SurfaceView}, this must be called from the * same thread running the SurfaceView's window. * * @param width The surface's width. @@ -167,14 +167,14 @@ public interface SurfaceHolder { * Allow the surface to resized based on layout of its container (this is * the default). When this is enabled, you should monitor * {@link Callback#surfaceChanged} for changes to the size of the surface. - * When working with a {link SurfaceView}, this must be called from the + * When working with a {@link SurfaceView}, this must be called from the * same thread running the SurfaceView's window. */ public void setSizeFromLayout(); /** * Set the desired PixelFormat of the surface. The default is OPAQUE. - * When working with a {link SurfaceView}, this must be called from the + * When working with a {@link SurfaceView}, this must be called from the * same thread running the SurfaceView's window. * * @param format A constant from PixelFormat. diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index b1caa2f4519b..f0ca302f4213 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -2362,7 +2362,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal * with a stable layout. (Note that you should avoid using * {@link #SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION} by itself.) * - * If you have set the window flag {@ WindowManager.LayoutParams#FLAG_FULLSCREEN} + * If you have set the window flag {@link WindowManager.LayoutParams#FLAG_FULLSCREEN} * to hide the status bar (instead of using {@link #SYSTEM_UI_FLAG_FULLSCREEN}), * then a hidden status bar will be considered a "stable" state for purposes * here. This allows your UI to continually hide the status bar, while still diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 6ec0955eb8b8..0c83a738e7ec 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -5206,7 +5206,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } /** - * If {link #addStatesFromChildren} is true, refreshes this group's + * If {@link #addStatesFromChildren} is true, refreshes this group's * drawable state (to include the states from its children). */ public void childDrawableStateChanged(View child) { diff --git a/core/java/android/view/textservice/TextServicesManager.java b/core/java/android/view/textservice/TextServicesManager.java index 161e8fb3e45b..81b36db50b29 100644 --- a/core/java/android/view/textservice/TextServicesManager.java +++ b/core/java/android/view/textservice/TextServicesManager.java @@ -91,11 +91,11 @@ public final class TextServicesManager { /** * Get a spell checker session for the specified spell checker - * @param locale the locale for the spell checker. If {@param locale} is null and + * @param locale the locale for the spell checker. If {@code locale} is null and * referToSpellCheckerLanguageSettings is true, the locale specified in Settings will be - * returned. If {@param locale} is not null and referToSpellCheckerLanguageSettings is true, - * the locale specified in Settings will be returned only when it is same as {@param locale}. - * Exceptionally, when referToSpellCheckerLanguageSettings is true and {@param locale} is + * returned. If {@code locale} is not null and referToSpellCheckerLanguageSettings is true, + * the locale specified in Settings will be returned only when it is same as {@code locale}. + * Exceptionally, when referToSpellCheckerLanguageSettings is true and {@code locale} is * only language (e.g. "en"), the specified locale in Settings (e.g. "en_US") will be * selected. * @param listener a spell checker session lister for getting results from a spell checker. diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java index 9f10cb037442..687d3a52810f 100644 --- a/media/java/android/media/MediaExtractor.java +++ b/media/java/android/media/MediaExtractor.java @@ -295,7 +295,7 @@ final public class MediaExtractor { * Returns true iff we are caching data and the cache has reached the * end of the data stream (for now, a future seek may of course restart * the fetching of data). - * This API only returns a meaningful result if {link #getCachedDuration} + * This API only returns a meaningful result if {@link #getCachedDuration} * indicates the presence of a cache, i.e. does NOT return -1. */ public native boolean hasCacheReachedEndOfStream(); diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 870a4a978593..cd25865b3ab5 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -706,7 +706,7 @@ public class MediaPlayer * surface rendering area. When the surface has the same aspect ratio * as the content, the aspect ratio of the content is maintained; * otherwise, the aspect ratio of the content is not maintained when video - * is being rendered. Unlike {@ #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING}, + * is being rendered. Unlike {@link #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING}, * there is no content cropping with this video scaling mode. */ public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; diff --git a/test-runner/src/android/test/MoreAsserts.java b/test-runner/src/android/test/MoreAsserts.java index 9e0d018b0afb..83cc420f66ea 100644 --- a/test-runner/src/android/test/MoreAsserts.java +++ b/test-runner/src/android/test/MoreAsserts.java @@ -158,7 +158,7 @@ public final class MoreAsserts { * Asserts that array {@code actual} is the same size and every element * is the same as those in array {@code expected}. Note that this uses * {@code equals()} instead of {@code ==} to compare the objects. - * {@code null} will be considered equal to {code null} (unlike SQL). + * {@code null} will be considered equal to {@code null} (unlike SQL). * On failure, message indicates first specific element mismatch. */ public static void assertEquals( diff --git a/test-runner/src/android/test/ServiceTestCase.java b/test-runner/src/android/test/ServiceTestCase.java index 06c1c5b31f4b..eaace2799de9 100644 --- a/test-runner/src/android/test/ServiceTestCase.java +++ b/test-runner/src/android/test/ServiceTestCase.java @@ -91,7 +91,7 @@ import java.util.Random; * {@link #setApplication setApplication()}. You must do this before calling * startService() or bindService(). The test framework provides a * number of alternatives for Context, including - * {link android.test.mock.MockContext MockContext}, + * {@link android.test.mock.MockContext MockContext}, * {@link android.test.RenamingDelegatingContext RenamingDelegatingContext}, * {@link android.content.ContextWrapper ContextWrapper}, and * {@link android.test.IsolatedContext}. diff --git a/tests/DataIdleTest/src/com/android/tests/dataidle/DataIdleTest.java b/tests/DataIdleTest/src/com/android/tests/dataidle/DataIdleTest.java index 919e2b332da4..4ec86b186285 100644 --- a/tests/DataIdleTest/src/com/android/tests/dataidle/DataIdleTest.java +++ b/tests/DataIdleTest/src/com/android/tests/dataidle/DataIdleTest.java @@ -69,7 +69,7 @@ public class DataIdleTest extends InstrumentationTestCase { /** * Helper method that fetches all the network stats available and reports it * to instrumentation out. - * @param template {link {@link NetworkTemplate} to match. + * @param template {@link NetworkTemplate} to match. */ private void fetchStats(NetworkTemplate template) { INetworkStatsSession session = null; diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 7f8f9ce7c80c..7e47c99ab78b 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -1590,7 +1590,7 @@ public class WifiStateMachine extends StateMachine { /** * Record the detailed state of a network. - * @param state the new @{code DetailedState} + * @param state the new {@code DetailedState} */ private void setNetworkDetailedState(NetworkInfo.DetailedState state) { if (DBG) { -- 2.11.0