diff options
| author | kmccormick <kmccormick@google.com> | 2013-06-21 23:00:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-21 23:00:18 +0000 |
| commit | dc22fa924a6df52fb6ad97aa63150c815a2f047f (patch) | |
| tree | 6cad9c0163af4811a0518afa3d229f508a32d88c /core | |
| parent | da4a3f324b2944e3f088b67981ef30447a6fdeed (diff) | |
| parent | f14ff1c9ce37299c2fcef258a854acf79c026ccf (diff) | |
| download | frameworks_base-dc22fa924a6df52fb6ad97aa63150c815a2f047f.zip frameworks_base-dc22fa924a6df52fb6ad97aa63150c815a2f047f.tar.gz frameworks_base-dc22fa924a6df52fb6ad97aa63150c815a2f047f.tar.bz2 | |
Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/bluetooth/package.html | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/java/android/bluetooth/package.html b/core/java/android/bluetooth/package.html index ba75034..200a21b 100644 --- a/core/java/android/bluetooth/package.html +++ b/core/java/android/bluetooth/package.html @@ -1,15 +1,20 @@ <HTML> <BODY> <p>Provides classes that manage Bluetooth functionality, such as scanning for -devices, connecting with devices, and managing data transfer between devices.</p> +devices, connecting with devices, and managing data transfer between devices. +The Bluetooth API supports both "Classic Bluetooth" and Bluetooth Low Energy.</p> -<p>For more information, see the -<a href="{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> guide.</p> +<p>For more information about Classic Bluetooth, see the +<a href="{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> guide. +For more information about Bluetooth Low Energy, see the +<a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html"> +Bluetooth Low Energy</a> guide.</p> {@more} <p>The Bluetooth APIs let applications:</p> <ul> - <li>Scan for other Bluetooth devices</li> + <li>Scan for other Bluetooth devices (including Bluetooth Low Energy + devices)</li> <li>Query the local Bluetooth adapter for paired Bluetooth devices</li> <li>Establish RFCOMM channels/sockets</li> <li>Connect to specified sockets on other devices</li> |