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

Commit 2ace7d5b authored by Vinay Kalia's avatar Vinay Kalia Committed by android-build-merger
Browse files

Merge "Update documentation for startScan" am: 7d2219d1 

am: 04d061e8

Change-Id: Ib88766933fef830d2613b9b92bc744aed75c6e9f
parents b519119e 04d061e8

core/java/android/bluetooth/le/BluetoothLeScanner.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -99,7 +99,9 @@ public final class BluetoothLeScanner { 




    /**

    /**

     * Start Bluetooth LE scan with default parameters and no filters. The scan results will be

     * Start Bluetooth LE scan with default parameters and no filters. The scan results will be

     * delivered through {@code callback}.

     * delivered through {@code callback}. For unfiltered scans, scanning is stopped on screen

     * off to save power. Scanning is resumed when screen is turned on again. To avoid this, use

     * {@link #startScan(List, ScanSettings, ScanCallback)} with desired {@link ScanFilter}.

     * <p>

     * <p>

     * An app must hold

     * An app must hold

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or
@@ -116,6 +118,9 @@ public final class BluetoothLeScanner { 




    /**

    /**

     * Start Bluetooth LE scan. The scan results will be delivered through {@code callback}.

     * Start Bluetooth LE scan. The scan results will be delivered through {@code callback}.

     * For unfiltered scans, scanning is stopped on screen off to save power. Scanning is

     * resumed when screen is turned on again. To avoid this, do filetered scanning by

     * using proper {@link ScanFilter}.

     * <p>

     * <p>

     * An app must hold

     * An app must hold

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or