diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-07-22 20:27:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-22 20:27:06 +0000 |
| commit | 5ef70b02ead0a1e164370fefaff27bfd1ce0d492 (patch) | |
| tree | d2860e1690991daa3d67e42d2852b87b4580d816 /core/java | |
| parent | 15a45e02c3372ad5deae0a260f782cd3e5a81d58 (diff) | |
| parent | 7bd8be0019cb5896c27d0a2d39be19274c442ba5 (diff) | |
| download | frameworks_base-5ef70b02ead0a1e164370fefaff27bfd1ce0d492.zip frameworks_base-5ef70b02ead0a1e164370fefaff27bfd1ce0d492.tar.gz frameworks_base-5ef70b02ead0a1e164370fefaff27bfd1ce0d492.tar.bz2 | |
Merge "Added a note about location permission" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/bluetooth/le/BluetoothLeScanner.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java index e09ab56..2ba8774 100644 --- a/core/java/android/bluetooth/le/BluetoothLeScanner.java +++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java @@ -79,6 +79,10 @@ public final class BluetoothLeScanner { * delivered through {@code callback}. * <p> * Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission. + * An app must hold + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION} permission + * in order to get results. * * @param callback Callback used to deliver scan results. * @throws IllegalArgumentException If {@code callback} is null. @@ -95,6 +99,10 @@ public final class BluetoothLeScanner { * Start Bluetooth LE scan. The scan results will be delivered through {@code callback}. * <p> * Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission. + * An app must hold + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION} permission + * in order to get results. * * @param filters {@link ScanFilter}s for finding exact BLE devices. * @param settings Settings for the scan. |