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

Merge "Revert "Set a floor value for BLE Batch Scan report delay of 5000ms"" am: 6528da5667 am: 3ed5afa516

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681445

Change-Id: I7131b38a96c8ca4db748047132ce59d1503eb671
This commit is contained in:
Nataniel Borges
2021-04-20 16:51:21 +00:00
committed by Automerger Merge Worker
parent bc401f523d 3ed5afa516
commit 81583909a9
1 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/bluetooth/le/ScanSettings.java
View File

@@ -20,7 +20,6 @@ import android.annotation.SystemApi;
import android.bluetooth.BluetoothDevice;
import android.os.Parcel;
import android.os.Parcelable;
import android.provider.DeviceConfig;
/**
* Bluetooth LE scan settings are passed to {@link BluetoothLeScanner#startScan} to define the
@@ -142,12 +141,6 @@ public final class ScanSettings implements Parcelable {
*/
public static final int PHY_LE_ALL_SUPPORTED = 255;
/**
* The default floor value for report delays greater than 0 in
* {@link Builder#setReportDelay(long)}.
*/
private static final long DEFAULT_REPORT_DELAY_FLOOR = 5000;
// Bluetooth LE scan mode.
private int mScanMode;
@@ -352,28 +345,18 @@ public final class ScanSettings implements Parcelable {
}
/**
* Set report delay timestamp for Bluetooth LE scan. If set to 0, you will be notified of
* scan results immediately. If > 0, scan results are queued up and delivered after the
* requested delay or 5000 milliseconds (whichever is higher). Note scan results may be
* delivered sooner if the internal buffers fill up.
* Set report delay timestamp for Bluetooth LE scan.
*
* @param reportDelayMillis how frequently scan results should be delivered in
* milliseconds
* @throws IllegalArgumentException if {@code reportDelayMillis} < 0
* @param reportDelayMillis Delay of report in milliseconds. Set to 0 to be notified of
* results immediately. Values > 0 causes the scan results to be queued up and delivered
* after the requested delay or when the internal buffers fill up.
* @throws IllegalArgumentException If {@code reportDelayMillis} < 0.
*/
public Builder setReportDelay(long reportDelayMillis) {
if (reportDelayMillis < 0) {
throw new IllegalArgumentException("reportDelay must be > 0");
}
long floor = DeviceConfig.getLong(DeviceConfig.NAMESPACE_BLUETOOTH, "report_delay",
DEFAULT_REPORT_DELAY_FLOOR);
if (reportDelayMillis > 0 && reportDelayMillis < floor) {
mReportDelayMillis = floor;
} else {
mReportDelayMillis = reportDelayMillis;
}
mReportDelayMillis = reportDelayMillis;
return this;
}