am 33b69050: Merge change 24155 into eclair

Merge commit '33b69050b2074c1768c45895418f0454e52e279a' into eclair-plus-aosp

* commit '33b69050b2074c1768c45895418f0454e52e279a':
  Add javadoc to explain which permissions are required for Public BT API's.

core/java/android/bluetooth/BluetoothAdapter.java

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

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

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

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