diff options
| author | 2011-02-01 17:12:23 -0800 | |
|---|---|---|
| committer | 2011-02-01 17:12:23 -0800 | |
| commit | 17689de1cf41017ecc09a75d9603a91841b8c84d (patch) | |
| tree | 4258f18e8bea958b12881a20d0ff7d22b7e10d2a | |
| parent | 8f43c1a5b918c0517d31b88d9b2d3c5b95365cf2 (diff) | |
| parent | 25bbfda2442e6d8f55bdc8e2dd0eca18b0ba594b (diff) | |
am 25bbfda2: am 485d577a: Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb
* commit '25bbfda2442e6d8f55bdc8e2dd0eca18b0ba594b':
Fix BluetoothAdapter Connection change intent doc.
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index fb3744d530ca..4656e153915d 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -296,12 +296,12 @@ public final class BluetoothAdapter { * can use this intent. * * <p>This intent will have 3 extras: - * {@link #EXTRA_STATE} - The current state. - * {@link #EXTRA_PREVIOUS_STATE}- The previous. + * {@link #EXTRA_CONNECTION_STATE} - The current connection state. + * {@link #EXTRA_PREVIOUS_CONNECTION_STATE}- The previous connection state. * {@link BluetoothDevice#EXTRA_DEVICE} - The remote device. * - * {@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} can be any of - * {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING}, + * {@link #EXTRA_CONNECTION_STATE} or {@link #EXTRA_PREVIOUS_CONNECTION_STATE} + * can be any of {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING}, * {@link #STATE_CONNECTED}, {@link #STATE_DISCONNECTING}. * * <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive. |