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

Commit 33b69050 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 24155 into eclair 

* changes:
  Add javadoc to explain which permissions are required for Public BT API's.
parents c19efc4a cf440598

core/java/android/bluetooth/BluetoothAdapter.java

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ public final class BluetoothAdapter { 
     * <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming

     * connections to listening {@link BluetoothServerSocket}.

     * <p>Valid RFCOMM channels are in range 1 to 30.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH}

     * @param channel RFCOMM channel to listen on

     * @return a listening RFCOMM BluetoothServerSocket

     * @throws IOException on error, for example Bluetooth not available, or

core/java/android/bluetooth/BluetoothDevice.java

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ public final class BluetoothDevice implements Parcelable { 
     * <p>Use {@link BluetoothSocket#connect} to intiate the outgoing

     * connection.

     * <p>Valid RFCOMM channels are in range 1 to 30.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH}

     * @param channel RFCOMM channel to connect to

     * @return a RFCOMM BluetoothServerSocket ready for an outgoing connection

     * @throws IOException on error, for example Bluetooth not available, or

core/java/android/bluetooth/BluetoothServerSocket.java

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ import java.io.IOException; 
 * <p>{@link BluetoothSocket} and {@link BluetoothServerSocket} are thread

 * safe. In particular, {@link #close} will always immediately abort ongoing

 * operations and close the socket.

 *

 * <p>All methods on a {@link BluetoothServerSocket} require

 * {@link android.Manifest.permission#BLUETOOTH}

 */

public final class BluetoothServerSocket implements Closeable {

core/java/android/bluetooth/BluetoothSocket.java

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; 
 * <p>{@link BluetoothSocket} and {@link BluetoothServerSocket} are thread

 * safe. In particular, {@link #close} will always immediately abort ongoing

 * operations and close the socket.

 *

 * <p>All methods on a {@link BluetoothSocket} require

 * {@link android.Manifest.permission#BLUETOOTH}

 */

public final class BluetoothSocket implements Closeable {

    /** Keep TYPE_ fields in sync with BluetoothSocket.cpp */