Merge "Add scan interval and window lengths to Settings.Global." am: d3dac85e46 am: 8c33c789ed

am: 4ec192fd26

Change-Id: Ieae2e96acac3f1372d4075145426065f666a221a
This commit is contained in:
Jeremy Klein
2018-01-24 23:46:11 +00:00
committed by android-build-merger
2 changed files with 48 additions and 3 deletions

View File

@@ -9335,13 +9335,52 @@ public final class Settings {
public static final String RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS =
"recommended_network_evaluator_cache_expiry_ms";
/**
/**
* Settings to allow BLE scans to be enabled even when Bluetooth is turned off for
* connectivity.
* @hide
*/
public static final String BLE_SCAN_ALWAYS_AVAILABLE =
"ble_scan_always_enabled";
public static final String BLE_SCAN_ALWAYS_AVAILABLE = "ble_scan_always_enabled";
/**
* The length in milliseconds of a BLE scan window in a low-power scan mode.
* @hide
*/
public static final String BLE_SCAN_LOW_POWER_WINDOW_MS = "ble_scan_low_power_window_ms";
/**
* The length in milliseconds of a BLE scan window in a balanced scan mode.
* @hide
*/
public static final String BLE_SCAN_BALANCED_WINDOW_MS = "ble_scan_balanced_window_ms";
/**
* The length in milliseconds of a BLE scan window in a low-latency scan mode.
* @hide
*/
public static final String BLE_SCAN_LOW_LATENCY_WINDOW_MS =
"ble_scan_low_latency_window_ms";
/**
* The length in milliseconds of a BLE scan interval in a low-power scan mode.
* @hide
*/
public static final String BLE_SCAN_LOW_POWER_INTERVAL_MS =
"ble_scan_low_power_interval_ms";
/**
* The length in milliseconds of a BLE scan interval in a balanced scan mode.
* @hide
*/
public static final String BLE_SCAN_BALANCED_INTERVAL_MS =
"ble_scan_balanced_interval_ms";
/**
* The length in milliseconds of a BLE scan interval in a low-latency scan mode.
* @hide
*/
public static final String BLE_SCAN_LOW_LATENCY_INTERVAL_MS =
"ble_scan_low_latency_interval_ms";
/**
* Used to save the Wifi_ON state prior to tethering.