Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c94c5fe5 authored by Omair Kamil's avatar Omair Kamil Committed by Automerger Merge Worker
Browse files

Merge "Update documentation in BluetoothAdapter to direct users to... 

Merge "Update documentation in BluetoothAdapter to direct users to BluetoothLeScanner for LE scans." into main am: a40afeca

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3114617



Change-Id: I2c2181f5bc9ee66f4905ebf57df0984a4eaad6dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8d64ee1 a40afeca

framework/java/android/bluetooth/BluetoothAdapter.java

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ import java.util.function.BiFunction; 
 * 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 {@link #listenUsingL2capChannel()};

 * or start a scan for Bluetooth LE devices with {@link #startLeScan(LeScanCallback callback)}.

 * or start a scan for Bluetooth LE devices with {@link BluetoothLeScanner#startScan(ScanCallback)}

 * using the scanner from {@link #getBluetoothLeScanner()}.

 *

 * <p>This class is thread safe. <div class="special reference">

 *