am 5ef70b02: Merge "Added a note about location permission" into mnc-dev (2a37b2ff) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -79,6 +79,10 @@ public final class BluetoothLeScanner {
	* delivered through {@code callback}.		* delivered through {@code callback}.
	* <p>		* <p>
	* Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.		* 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.		* @param callback Callback used to deliver scan results.
	* @throws IllegalArgumentException If {@code callback} is null.		* @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}.		* Start Bluetooth LE scan. The scan results will be delivered through {@code callback}.
	* <p>		* <p>
	* Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.		* 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 filters {@link ScanFilter}s for finding exact BLE devices.
	* @param settings Settings for the scan.		* @param settings Settings for the scan.