diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd index 21881eb36da04..8a0efc9ac3d87 100644 --- a/docs/html/guide/topics/wireless/bluetooth.jd +++ b/docs/html/guide/topics/wireless/bluetooth.jd @@ -428,6 +428,11 @@ android.bluetooth.BluetoothSocket} in different ways. The server will receive it when an incoming connection is accepted. The client will receive it when it opens an RFCOMM channel to the server.
+
+Figure 3: The Bluetooth pairing dialog.
+One implementation technique is to automatically prepare each device as a server, so that each one has a server socket open and listening for connections. Then either device can initiate a connection with the other and become the @@ -435,14 +440,10 @@ client. Alternatively, one device can explicitly "host" the connection and open a server socket on demand and the other device can simply initiate the connection.
-
-Figure 3: The Bluetooth pairing dialog.
-Note: If the two devices have not been previously paired, then the Android framework will automatically show a pairing request notification or -dialog to the user during the connection procedure. So when attempting to connect devices, +dialog to the user during the connection procedure, as shown in Figure 3. So +when attempting to connect devices, your application does not need to be concerned about whether or not the devices are paired. Your RFCOMM connection attempt will block until the user has successfully paired, or will fail if the user rejects pairing, or if pairing fails or times out.
diff --git a/docs/html/images/bt_enable_discoverable.png b/docs/html/images/bt_enable_discoverable.png new file mode 100644 index 0000000000000..7caec94af8398 Binary files /dev/null and b/docs/html/images/bt_enable_discoverable.png differ diff --git a/docs/html/images/bt_enable_request.png b/docs/html/images/bt_enable_request.png new file mode 100644 index 0000000000000..6fb78310a66f7 Binary files /dev/null and b/docs/html/images/bt_enable_request.png differ diff --git a/docs/html/images/bt_pairing_request.png b/docs/html/images/bt_pairing_request.png new file mode 100644 index 0000000000000..32725945b00bf Binary files /dev/null and b/docs/html/images/bt_pairing_request.png differ