Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81df9841 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in... 

am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo

Merge commit '2c1dab44' into gingerbread-plus-aosp

* commit '2c1dab44':
  docs: fix typo; surface dev guide link in package description
parents b2bd4700 2c1dab44

core/java/android/bluetooth/package.html

+6 −5
Original line number Original line Diff line number Diff line 
<HTML>

<HTML>

<BODY>

<BODY>

Provides classes that manage Bluetooth functionality, such as scanning for

<p>Provides classes that manage Bluetooth functionality, such as scanning for

devices, connecting with devices, and managing data transfer between devices.

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>

<p>The Bluetooth APIs let applications:</p>

<ul>

<ul>
@@ -20,9 +24,6 @@ also requires the {@link android.Manifest.permission#BLUETOOTH_ADMIN} 
permission.

permission.

</p>

</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>

<p class="note"><strong>Note:</strong>

Not all Android devices are guaranteed to have Bluetooth functionality.</p>

Not all Android devices are guaranteed to have Bluetooth functionality.</p>

</BODY>

</BODY>

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

+3 −3
Original line number Original line 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,

of paired devices to see if the desired device is already known. To do so,

call {@link android.bluetooth.BluetoothAdapter#getBondedDevices()}. This

call {@link android.bluetooth.BluetoothAdapter#getBondedDevices()}. This

will return a Set of {@link android.bluetooth.BluetoothDevice}s representing

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>

show the name of each device to the user, using an ArrayAdapter:</p>

<pre>

<pre>

Set&lt;BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();

Set&lt;BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();