diff options
| author | Jake Hamby <jhamby@google.com> | 2010-09-30 16:29:13 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2010-09-30 16:29:13 -0700 |
| commit | c242248fe9ec993dad34c81f88747bfdebe329aa (patch) | |
| tree | 17a7e9bda8fdb3df05f274c45b9e8fa395325c0b /framework/java/android/bluetooth/BluetoothDevicePicker.java | |
| parent | a41d275138f30a3b0e65e6a2b5c0d485da40cc0c (diff) | |
| parent | 04c7138c7c1f36d54fbe33c40644e197248166b9 (diff) | |
resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp
Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothDevicePicker.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothDevicePicker.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevicePicker.java b/framework/java/android/bluetooth/BluetoothDevicePicker.java index 05eed0e6de..3a07033eab 100644 --- a/framework/java/android/bluetooth/BluetoothDevicePicker.java +++ b/framework/java/android/bluetooth/BluetoothDevicePicker.java @@ -36,7 +36,8 @@ public interface BluetoothDevicePicker { /** * Broadcast when one BT device is selected from BT device picker screen. - * Selected BT device address is contained in extra string {@link BluetoothIntent} + * Selected {@link BluetoothDevice} is returned in extra data named + * {@link BluetoothDevice#EXTRA_DEVICE}. */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_DEVICE_SELECTED = |