Merge "docs: fix typo; surface dev guide link in package description" into froyo (fda5b19c) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/package.html

+6 −5

Original line number	Diff line number	Diff line
		<HTML>
		<BODY>
		Provides classes that manage Bluetooth functionality, such as scanning for
		devices, connecting with devices, and managing data transfer between devices.
		<p>Provides classes that manage Bluetooth functionality, such as scanning for
		devices, connecting with devices, and managing data transfer between devices.</p>

		<p>For a complete guide to using the Bluetooth APIs, see the <a
		href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p>
		{@more}

		<p>The Bluetooth APIs let applications:</p>
		<ul>
		@@ -20,9 +24,6 @@ also requires the {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		permission.
		</p>

		<p>For a detailed guide to using the Bluetooth APIs, see the <a
		href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth Dev Guide topic</a>.</p>

		<p class="note"><strong>Note:</strong>
		Not all Android devices are guaranteed to have Bluetooth functionality.</p>
		</BODY>

+3 −3

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@ is discussed below.</p>
		of paired devices to see if the desired device is already known. To do so,
		call {@link android.bluetooth.BluetoothAdapter#getBondedDevices()}. This
		will return a Set of {@link android.bluetooth.BluetoothDevice}s representing
		paired devices. For example, you can query all paired devices and then add then
		paired devices. For example, you can query all paired devices and then
		show the name of each device to the user, using an ArrayAdapter:</p>
		<pre>
		Set<BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();