diff options
| author | Stanley Tng <stng@google.com> | 2018-04-16 19:08:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-16 19:08:53 -0700 |
| commit | 55cf2d39f99bced05acf97d9d0d39fa808c4c5e6 (patch) | |
| tree | df4c5da990675a51729127a241e91e4968f3b7fb /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 7fd9681cf120d7103b5f67e83778f32b371bebd7 (diff) | |
| parent | d7a1d7ed19a9b1f4f2f463453127dd752a236c5b (diff) | |
Merge "Cleanup documentation for LE CoC in BluetoothAdapter" am: 7b25698549
am: d7a1d7ed19
Change-Id: Ia23d8a96128420576d8b6ff5eae0075825df8c2f
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index ee667c2207..1b6b5a01ec 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -80,8 +80,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; * {@link #getBondedDevices()}; start device discovery with * {@link #startDiscovery()}; or create a {@link BluetoothServerSocket} to * listen for incoming RFComm connection requests with {@link - * #listenUsingRfcommWithServiceRecord(String, UUID)}; listen for incoming L2CAP Connection-oriented - * Channels (CoC) connection requests with listenUsingL2capCoc(int)}; or start a scan for + * #listenUsingRfcommWithServiceRecord(String, UUID)}; or start a scan for * Bluetooth LE devices with {@link #startLeScan(LeScanCallback callback)}. * </p> * <p>This class is thread safe.</p> |