diff options
| author | Joe Fernandez <joefernandez@google.com> | 2011-12-22 15:59:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-22 15:59:34 -0800 |
| commit | 2b072677538de979961b5bf527109fdab1713731 (patch) | |
| tree | abe7c7d86618d0efa1ace6e3b56e20161e458ed2 /core/java/android/bluetooth | |
| parent | 2bd0d74a5885f72435da228a00495bae72c07f6f (diff) | |
| parent | 201469f54522436be79d4d6665721049bfc74320 (diff) | |
| download | frameworks_base-2b072677538de979961b5bf527109fdab1713731.zip frameworks_base-2b072677538de979961b5bf527109fdab1713731.tar.gz frameworks_base-2b072677538de979961b5bf527109fdab1713731.tar.bz2 | |
am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '201469f54522436be79d4d6665721049bfc74320':
docs: Add developer guide cross-references, Project ACRE, round 4
Diffstat (limited to 'core/java/android/bluetooth')
5 files changed, 27 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index e420bfd..600ce6f 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -62,6 +62,12 @@ import java.util.UUID; * permission and some also require the * {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using Bluetooth, read the + * <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> + * </div> + * * {@see BluetoothDevice} * {@see BluetoothServerSocket} */ diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 0306521..189e8fc 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -54,6 +54,12 @@ import java.util.UUID; * <p class="note"><strong>Note:</strong> * Requires the {@link android.Manifest.permission#BLUETOOTH} permission. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using Bluetooth, read the + * <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> + * </div> + * * {@see BluetoothAdapter} * {@see BluetoothSocket} */ diff --git a/core/java/android/bluetooth/BluetoothServerSocket.java b/core/java/android/bluetooth/BluetoothServerSocket.java index acce182..4021f7b 100644 --- a/core/java/android/bluetooth/BluetoothServerSocket.java +++ b/core/java/android/bluetooth/BluetoothServerSocket.java @@ -55,6 +55,12 @@ import java.io.IOException; * <p class="note"><strong>Note:</strong> * Requires the {@link android.Manifest.permission#BLUETOOTH} permission. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using Bluetooth, read the + * <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> + * </div> + * * {@see BluetoothSocket} */ public final class BluetoothServerSocket implements Closeable { diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java index 9a13c3e..19d13ef 100644 --- a/core/java/android/bluetooth/BluetoothSocket.java +++ b/core/java/android/bluetooth/BluetoothSocket.java @@ -65,6 +65,12 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; * <p class="note"><strong>Note:</strong> * Requires the {@link android.Manifest.permission#BLUETOOTH} permission. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using Bluetooth, read the + * <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> + * </div> + * * {@see BluetoothServerSocket} * {@see java.io.InputStream} * {@see java.io.OutputStream} diff --git a/core/java/android/bluetooth/package.html b/core/java/android/bluetooth/package.html index 37505fd..81bf1cf 100644 --- a/core/java/android/bluetooth/package.html +++ b/core/java/android/bluetooth/package.html @@ -3,8 +3,8 @@ <p>Provides classes that manage Bluetooth functionality, such as scanning for devices, connecting with devices, and managing data transfer between devices.</p> -<p>For more information, see the <a -href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> +<p>For more information, see the +<a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> {@more} <p>The Bluetooth APIs let applications:</p> @@ -26,5 +26,6 @@ permission. <p class="note"><strong>Note:</strong> Not all Android-powered devices provide Bluetooth functionality.</p> + </BODY> </HTML> |