Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a6631f57fa49c00d722f6d521b9882781be6dfa0':
  Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN
This commit is contained in:
Matthew Xie
2013-04-24 18:46:00 -07:00
committed by Android Git Automerger
parent ad6ff205af a6631f57fa
commit b0225f41da
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -1434,7 +1434,7 @@ public final class BluetoothAdapter {
* <p>Results of the scan are reported using the * <p>Results of the scan are reported using the
* {@link LeScanCallback#onLeScan} callback. * {@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 * @param callback the callback LE scan results are delivered
* @return true, if the scan was started successfully * @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 * <p>Devices which advertise all specified services are reported using the
* {@link LeScanCallback#onLeScan} callback. * {@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 serviceUuids Array of services to look for
* @param callback the callback LE scan results are delivered * @param callback the callback LE scan results are delivered
@@ -1490,7 +1490,7 @@ public final class BluetoothAdapter {
/** /**
* Stops an ongoing Bluetooth LE device scan. * 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 * @param callback used to identify which scan to stop
* must be the same handle used to start the scan * must be the same handle used to start the scan