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

Commit a6631f57 authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN" into jb-mr2-dev

parents 78cfd3cc d575233c

core/java/android/bluetooth/BluetoothAdapter.java

+3 −3
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ public final class BluetoothAdapter { 
     * <p>Results of the scan are reported using the

     * {@link LeScanCallback#onLeScan} callback.

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.

     *

     * @param callback the callback LE scan results are delivered

     * @return true, if the scan was started successfully
@@ -1450,7 +1450,7 @@ public final class BluetoothAdapter { 
     * <p>Devices which advertise all specified services are reported using the

     * {@link LeScanCallback#onLeScan} callback.

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.

     *

     * @param serviceUuids Array of services to look for

     * @param callback the callback LE scan results are delivered
@@ -1490,7 +1490,7 @@ public final class BluetoothAdapter { 
    /**

     * Stops an ongoing Bluetooth LE device scan.

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.

     *

     * @param callback used to identify which scan to stop

     *        must be the same handle used to start the scan