diff options
| author | Jake Hamby <jhamby@google.com> | 2010-09-30 19:33:43 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2010-09-30 19:33:43 -0700 |
| commit | 760646529bb84c07cfaa28b1c6308f6ae23e82ff (patch) | |
| tree | 672012dab5d97a6dc2d77269c91aa339471f94c0 /framework/java/android/bluetooth/BluetoothDevicePicker.java | |
| parent | dae21e755316c579f805428af0e7d4c3af25bf1d (diff) | |
| parent | c242248fe9ec993dad34c81f88747bfdebe329aa (diff) | |
resolved conflicts for merge of c242248f to master
Change-Id: I8810cc6dbd532de002d6a623ad93e86afb48c0b4
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 741572151f..c794be2e2c 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 = |