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/BluetoothClass.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/BluetoothClass.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothClass.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothClass.java b/framework/java/android/bluetooth/BluetoothClass.java index c8381c96a3..e604e6becc 100644 --- a/framework/java/android/bluetooth/BluetoothClass.java +++ b/framework/java/android/bluetooth/BluetoothClass.java @@ -34,8 +34,8 @@ import android.os.Parcelable; * Bluetooth profiles or services are actually supported by a device. Accurate * service discovery is done through SDP requests, which are automatically * performed when creating an RFCOMM socket with {@link - * BluetoothDevice#createRfcommSocketToServiceRecord(UUID)} and {@link - * BluetoothAdapter#listenUsingRfcommWithServiceRecord(String,UUID)}</p> + * BluetoothDevice#createRfcommSocketToServiceRecord} and {@link + * BluetoothAdapter#listenUsingRfcommWithServiceRecord}</p> * * <p>Use {@link BluetoothDevice#getBluetoothClass} to retrieve the class for * a remote device. |