From ac6e72bb075a4fd379cafa73a5e0286fd1482687 Mon Sep 17 00:00:00 2001 From: Anthony Stange Date: Fri, 16 Mar 2018 17:22:14 +0000 Subject: [PATCH] Revert "Add scan background mode to Settings.Global." This reverts commit bf9f70e1467dabe3528db06082c24285ffa0b2c7. Reason for revert: aosp is automatically merged to the internal tree. Since this was submitted outside the tree too, it's causing problems it seems. https://android-build.googleplex.com/builds/branches/git_mirror-aosp-master-with-vendor/grid?head=4659773&tail=4659610 Change-Id: I086d636ce8c7b67b33904195e6977e6c333e08ba --- core/java/android/provider/Settings.java | 6 ------ .../coretests/src/android/provider/SettingsBackupTest.java | 1 - 2 files changed, 7 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f1ab3db95086a..a5f63d4f56885 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9534,12 +9534,6 @@ 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 052e6b9efb6b6..22a261e354533 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -129,7 +129,6 @@ 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,