From 45a9b5dbbc071d777b8d22c085ba33298afcac49 Mon Sep 17 00:00:00 2001 From: Jeremy Klein Date: Wed, 10 Jan 2018 18:01:46 -0800 Subject: [PATCH] Add scan interval and window lengths to Settings.Global. This will enable running experiments to determine the effects on battery life of changing these values. Bug: 71765044 Test: Just adding a key value here. This is basically a no-op. Change-Id: I33a0b2da6e793ef508d020a3c2d321d5553c3fb1 --- core/java/android/provider/Settings.java | 45 +++++++++++++++++-- .../android/provider/SettingsBackupTest.java | 6 +++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ed682767bfd79..7ad4373e7907a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8646,13 +8646,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. diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 19808cae37218..ee276ef119571 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -111,6 +111,12 @@ public class SettingsBackupTest { Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD, Settings.Global.BATTERY_DISCHARGE_THRESHOLD, 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_SRC_PRIORITY_PREFIX, Settings.Global.BLUETOOTH_A2DP_SUPPORTS_OPTIONAL_CODECS_PREFIX,