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

Commit 4ec192fd authored by Jeremy Klein's avatar Jeremy Klein Committed by android-build-merger
Browse files

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

am: 8c33c789

Change-Id: Ib86750eadcf5683faba4151e3f3373f04a387de1
parents 07b212b7 8c33c789

core/java/android/provider/Settings.java

+42 −3
Original line number Diff line number Diff line
@@ -8657,8 +8657,47 @@ public final class Settings { 
        * 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.

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

+6 −0
Original line number Diff line number Diff line
@@ -110,6 +110,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,