Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 24155 into eclair

Browse Source 
* changes:
  Add javadoc to explain which permissions are required for Public BT API's.
This commit is contained in:
Android (Google) Code Review
2009-09-08 13:37:10 -07:00
parent c19efc4acb cf44059813
commit 33b69050b2
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -303,6 +303,7 @@ public final class BluetoothAdapter {
* <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming * <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming
* connections to listening {@link BluetoothServerSocket}. * connections to listening {@link BluetoothServerSocket}.
* <p>Valid RFCOMM channels are in range 1 to 30. * <p>Valid RFCOMM channels are in range 1 to 30.
* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
* @param channel RFCOMM channel to listen on * @param channel RFCOMM channel to listen on
* @return a listening RFCOMM BluetoothServerSocket * @return a listening RFCOMM BluetoothServerSocket
* @throws IOException on error, for example Bluetooth not available, or * @throws IOException on error, for example Bluetooth not available, or

1
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -357,6 +357,7 @@ public final class BluetoothDevice implements Parcelable {
* <p>Use {@link BluetoothSocket#connect} to intiate the outgoing * <p>Use {@link BluetoothSocket#connect} to intiate the outgoing
* connection. * connection.
* <p>Valid RFCOMM channels are in range 1 to 30. * <p>Valid RFCOMM channels are in range 1 to 30.
* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
* @param channel RFCOMM channel to connect to * @param channel RFCOMM channel to connect to
* @return a RFCOMM BluetoothServerSocket ready for an outgoing connection * @return a RFCOMM BluetoothServerSocket ready for an outgoing connection
* @throws IOException on error, for example Bluetooth not available, or * @throws IOException on error, for example Bluetooth not available, or

3
core/java/android/bluetooth/BluetoothServerSocket.java
View File

@@ -45,6 +45,9 @@ import java.io.IOException;
* <p>{@link BluetoothSocket} and {@link BluetoothServerSocket} are thread * <p>{@link BluetoothSocket} and {@link BluetoothServerSocket} are thread
* safe. In particular, {@link #close} will always immediately abort ongoing * safe. In particular, {@link #close} will always immediately abort ongoing
* operations and close the socket. * operations and close the socket.
*
* <p>All methods on a {@link BluetoothServerSocket} require
* {@link android.Manifest.permission#BLUETOOTH}
*/ */
public final class BluetoothServerSocket implements Closeable { public final class BluetoothServerSocket implements Closeable {

3
core/java/android/bluetooth/BluetoothSocket.java
View File

@@ -49,6 +49,9 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
* <p>{@link BluetoothSocket} and {@link BluetoothServerSocket} are thread * <p>{@link BluetoothSocket} and {@link BluetoothServerSocket} are thread
* safe. In particular, {@link #close} will always immediately abort ongoing * safe. In particular, {@link #close} will always immediately abort ongoing
* operations and close the socket. * operations and close the socket.
*
* <p>All methods on a {@link BluetoothSocket} require
* {@link android.Manifest.permission#BLUETOOTH}
*/ */
public final class BluetoothSocket implements Closeable { public final class BluetoothSocket implements Closeable {
/** Keep TYPE_ fields in sync with BluetoothSocket.cpp */ /** Keep TYPE_ fields in sync with BluetoothSocket.cpp */