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

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

Browse Source 
am: 8c33c789ed

Change-Id: Ib86750eadcf5683faba4151e3f3373f04a387de1
This commit is contained in:
Jeremy Klein
2018-01-24 23:34:38 +00:00
committed by android-build-merger
parent 07b212b788 8c33c789ed
commit 4ec192fd26
2 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/java/android/provider/Settings.java
View File

@@ -8652,13 +8652,52 @@ public final class Settings {
public static final String RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS = public static final String RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS =
"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 * Settings to allow BLE scans to be enabled even when Bluetooth is turned off for
* connectivity. * connectivity.
* @hide * @hide
*/ */
public static final String BLE_SCAN_ALWAYS_AVAILABLE = public static final String BLE_SCAN_ALWAYS_AVAILABLE = "ble_scan_always_enabled";
"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. * Used to save the Wifi_ON state prior to tethering.

6
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -110,6 +110,12 @@ public class SettingsBackupTest {
Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD, Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD,
Settings.Global.BATTERY_DISCHARGE_THRESHOLD, Settings.Global.BATTERY_DISCHARGE_THRESHOLD,
Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE,
Settings.Global.BLE_SCAN_LOW_POWER_WINDOW_MS,
Settings.Global.BLE_SCAN_LOW_POWER_INTERVAL_MS,
Settings.Global.BLE_SCAN_BALANCED_WINDOW_MS,
Settings.Global.BLE_SCAN_BALANCED_INTERVAL_MS,
Settings.Global.BLE_SCAN_LOW_LATENCY_WINDOW_MS,
Settings.Global.BLE_SCAN_LOW_LATENCY_INTERVAL_MS,
Settings.Global.BLUETOOTH_A2DP_SINK_PRIORITY_PREFIX, Settings.Global.BLUETOOTH_A2DP_SINK_PRIORITY_PREFIX,
Settings.Global.BLUETOOTH_A2DP_SRC_PRIORITY_PREFIX, Settings.Global.BLUETOOTH_A2DP_SRC_PRIORITY_PREFIX,
Settings.Global.BLUETOOTH_A2DP_SUPPORTS_OPTIONAL_CODECS_PREFIX, Settings.Global.BLUETOOTH_A2DP_SUPPORTS_OPTIONAL_CODECS_PREFIX,