drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb

Browse Source
This commit is contained in:
Jaikumar Ganesh
2011-02-01 17:06:56 -08:00
committed by Android (Google) Code Review
parent e77f99144f 0b5b35f8a1
commit 485d577af1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,12 +296,12 @@ public final class BluetoothAdapter {
* can use this intent. * can use this intent.
* *
* <p>This intent will have 3 extras: * <p>This intent will have 3 extras:
* {@link #EXTRA_STATE} - The current state. * {@link #EXTRA_CONNECTION_STATE} - The current connection state.
* {@link #EXTRA_PREVIOUS_STATE}- The previous. * {@link #EXTRA_PREVIOUS_CONNECTION_STATE}- The previous connection state.
* {@link BluetoothDevice#EXTRA_DEVICE} - The remote device. * {@link BluetoothDevice#EXTRA_DEVICE} - The remote device.
* *
* {@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} can be any of * {@link #EXTRA_CONNECTION_STATE} or {@link #EXTRA_PREVIOUS_CONNECTION_STATE}
* {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING}, * can be any of {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING},
* {@link #STATE_CONNECTED}, {@link #STATE_DISCONNECTING}. * {@link #STATE_CONNECTED}, {@link #STATE_DISCONNECTING}.
* *
* <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive. * <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.