diff options
| author | 2018-03-20 17:29:42 +0000 | |
|---|---|---|
| committer | 2018-03-20 17:29:42 +0000 | |
| commit | e1671a5c744193d74d009de3c706d733b27a285e (patch) | |
| tree | 88507972e828cbe7e9dc9da1dfe2e70485af4e7c | |
| parent | c6d6f55ec4850642bb80d42a4f7165ff07d2a0fe (diff) | |
| parent | c97870a91ab4eadb03dec6fbdebd01cb6663ae3d (diff) | |
Merge "DO NOT MERGE Add scan background mode to Settings.Global." into pi-dev
| -rw-r--r-- | core/java/android/provider/Settings.java | 6 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/provider/SettingsBackupTest.java | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 79b6ea6e5a7c..50d9767ca780 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9541,6 +9541,12 @@ public final class Settings { public static final String BLE_SCAN_LOW_LATENCY_INTERVAL_MS = "ble_scan_low_latency_interval_ms"; + /** + * The mode that BLE scanning clients will be moved to when in the background. + * @hide + */ + public static final String BLE_SCAN_BACKGROUND_MODE = "ble_scan_background_mode"; + /** * Used to save the Wifi_ON state prior to tethering. * This state will be checked to restore Wifi after diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index cc36b9682603..63343bef67e7 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -129,6 +129,7 @@ public class SettingsBackupTest { 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.BLE_SCAN_BACKGROUND_MODE, Settings.Global.BLUETOOTH_A2DP_SINK_PRIORITY_PREFIX, Settings.Global.BLUETOOTH_A2DP_SRC_PRIORITY_PREFIX, Settings.Global.BLUETOOTH_A2DP_SUPPORTS_OPTIONAL_CODECS_PREFIX, |