Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge (781292b4) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/le/ScanSettings.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,13 @@ import android.os.Parcelable;
		* parameters for the scan.
		*/
		public final class ScanSettings implements Parcelable {

		/**
		* A special Bluetooth LE scan mode. Applications using this scan mode will passively listen for
		* other scan results without starting BLE scans themselves.
		*/
		public static final int SCAN_MODE_OPPORTUNISTIC = -1;

		/**
		* Perform Bluetooth LE scan in low power mode. This is the default scan mode as it consumes the
		* least power.
		@@ -177,7 +184,7 @@ public final class ScanSettings implements Parcelable {
		* @throws IllegalArgumentException If the {@code scanMode} is invalid.
		*/
		public Builder setScanMode(int scanMode) {
		if (scanMode < SCAN_MODE_LOW_POWER \|\| scanMode > SCAN_MODE_LOW_LATENCY) {
		if (scanMode < SCAN_MODE_OPPORTUNISTIC \|\| scanMode > SCAN_MODE_LOW_LATENCY) {
		throw new IllegalArgumentException("invalid scan mode " + scanMode);
		}
		mScanMode = scanMode;