am 75c59fb9: am dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev (30c8973f) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/package.html

+9 −4

Original line number	Diff line number	Diff line
		<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>

docs/html/guide/guide_toc.cs

+10 −5

Original line number	Diff line number	Diff line
		@@ -393,9 +393,13 @@
		<span class="en">Connectivity</span>
		</a></div>
		<ul>
		<li><a href="<?cs var:toroot?>guide/topics/connectivity/bluetooth.html">
		<span class="en">Bluetooth</span>
		</a>
		<li class="nav-section">
		<div class="nav-section-header"><a href="<?cs var:toroot?>guide/topics/connectivity/bluetooth.html">
		<span class="en">Bluetooth</span></a>
		</div>
		<ul>
		<li><a href="<?cs var:toroot ?>guide/topics/connectivity/bluetooth-le.html">Bluetooth Low Energy</a></li>
		</ul>
		</li>
		<li class="nav-section">
		<div class="nav-section-header"><a href="<?cs var:toroot?>guide/topics/connectivity/nfc/index.html">
		@@ -426,6 +430,7 @@
		</ul>
		</li><!-- end of connectivity -->


		<li class="nav-section">
		<div class="nav-section-header"><a href="<?cs var:toroot ?>guide/topics/text/index.html">
		<span class="en">Text and Input</span>

docs/html/guide/topics/connectivity/bluetooth-le.jd

0 → 100644

+608 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/guide/topics/connectivity/bluetooth.jd

+19 −24

Original line number	Diff line number	Diff line
		@@ -5,12 +5,6 @@ page.tags="wireless","bluetoothadapter","bluetoothdevice"
		<div id="qv-wrapper">
		<div id="qv">

		<h2>Quickview</h2>
		<ul>
		<li>Android's bluetooth APIs allow your application to perform wireless data transactions with
		other devices</li>
		</ul>

		<h2>In this document</h2>
		<ol>
		<li><a href="#TheBasics">The Basics</a></li>
		@@ -70,6 +64,11 @@ following:</p>
		<li>Manage multiple connections</li>
		</ul>

		<p>This document describes how to use <em>Classic Bluetooth</em>. Classic
		Bluetooth is the right choice for more battery-intensive operations such as streaming
		and communicating between Android devices. For Bluetooth devices with low power requirements,
		Android 4.3 (API Level 18) introduces API support for Bluetooth Low Energy. To learn more,
		see <a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">Bluetooth Low Energy</a>.</p>

		<h2 id="TheBasics">The Basics</h2>

		@@ -164,22 +163,18 @@ is, the internal service that runs a particular profile). </dd>

		<h2 id="Permissions">Bluetooth Permissions</h2>

		<p>In order to use Bluetooth features in your application, you need to declare
		at least one of two Bluetooth permissions: {@link
		android.Manifest.permission#BLUETOOTH} and {@link
		android.Manifest.permission#BLUETOOTH_ADMIN}.</p>

		<p>You must request the {@link android.Manifest.permission#BLUETOOTH} permission
		in order to perform any Bluetooth communication, such as requesting a
		connection, accepting a connection, and transferring data.</p>
		<p>In order to use Bluetooth features in your application, you must declare
		the Bluetooth permission {@link android.Manifest.permission#BLUETOOTH}.
		You need this permission to perform any Bluetooth communication,
		such as requesting a connection, accepting a connection, and transferring data.</p>

		<p>You must request the {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		permission in order to initiate device discovery or manipulate Bluetooth
		settings. Most applications need this permission solely for the
		<p>If you want your app to initiate device discovery or manipulate Bluetooth
		settings, you must also declare the {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		permission. Most applications need this permission solely for the
		ability to discover local Bluetooth devices. The other abilities granted by this
		permission should not be used, unless the application is a "power manager" that
		will modify Bluetooth settings upon user request. <strong>Note:</strong> If you
		use {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission, then must
		use {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission, then you must
		also have the {@link android.Manifest.permission#BLUETOOTH} permission.</p>

		<p>Declare the Bluetooth permission(s) in your application manifest file. For