diff options
| author | Matthew Xie <mattx@google.com> | 2013-04-25 01:42:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-25 01:42:14 +0000 |
| commit | a6631f57fa49c00d722f6d521b9882781be6dfa0 (patch) | |
| tree | b0f79d0230abd0c1feb3cb6b7ddf6cbc0da2954e /core/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 78cfd3cc432e8660cb23619b354a418a7a26f4b0 (diff) | |
| parent | d575233c53d46d55db79c269e716d1d1115fd368 (diff) | |
| download | frameworks_base-a6631f57fa49c00d722f6d521b9882781be6dfa0.zip frameworks_base-a6631f57fa49c00d722f6d521b9882781be6dfa0.tar.gz frameworks_base-a6631f57fa49c00d722f6d521b9882781be6dfa0.tar.bz2 | |
Merge "Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN" into jb-mr2-dev
Diffstat (limited to 'core/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 3498bb8..cfbfb48 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -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 |