Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac6e72bb authored by Anthony Stange's avatar Anthony Stange
Browse files

Revert "Add scan background mode to Settings.Global." 

This reverts commit bf9f70e1.

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
parent bf9f70e1

core/java/android/provider/Settings.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -9534,12 +9534,6 @@ public final class Settings { 
        public static final String BLE_SCAN_LOW_LATENCY_INTERVAL_MS =

        public static final String BLE_SCAN_LOW_LATENCY_INTERVAL_MS =

                "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.

        * Used to save the Wifi_ON state prior to tethering.

        * This state will be checked to restore Wifi after

        * This state will be checked to restore Wifi after

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,6 @@ public class SettingsBackupTest { 
                    Settings.Global.BLE_SCAN_BALANCED_INTERVAL_MS,

                    Settings.Global.BLE_SCAN_BALANCED_INTERVAL_MS,

                    Settings.Global.BLE_SCAN_LOW_LATENCY_WINDOW_MS,

                    Settings.Global.BLE_SCAN_LOW_LATENCY_WINDOW_MS,

                    Settings.Global.BLE_SCAN_LOW_LATENCY_INTERVAL_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_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,