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

Commit 265efbd5 authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "Settings: Remove unused bg scan throttle settings" into pi-dev 

am: f4f31779

Change-Id: Ifb8dcd8b7d98bf427864651d5a80b4d2efbb3d77
parents 90d17942 f4f31779

core/java/android/provider/Settings.java

+0 −15
Original line number Diff line number Diff line
@@ -8789,21 +8789,6 @@ public final class Settings { 
        public static final String LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST =

            "location_background_throttle_package_whitelist";



        /**

         * The interval in milliseconds at which wifi scan requests will be throttled when they are

         * coming from the background.

         * @hide

         */

        public static final String WIFI_SCAN_BACKGROUND_THROTTLE_INTERVAL_MS =

                "wifi_scan_background_throttle_interval_ms";



        /**

         * Packages that are whitelisted to be exempt for wifi background throttling.

         * @hide

         */

        public static final String WIFI_SCAN_BACKGROUND_THROTTLE_PACKAGE_WHITELIST =

                "wifi_scan_background_throttle_package_whitelist";



        /**

        * Whether TV will switch to MHL port when a mobile device is plugged in.

        * (0 = false, 1 = true)

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

+0 −2
Original line number Diff line number Diff line
@@ -447,8 +447,6 @@ public class SettingsBackupTest { 
                    Settings.Global.WIFI_REENABLE_DELAY_MS,

                    Settings.Global.WIFI_SAVED_STATE,

                    Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,

                    Settings.Global.WIFI_SCAN_BACKGROUND_THROTTLE_INTERVAL_MS,

                    Settings.Global.WIFI_SCAN_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,

                    Settings.Global.WIFI_SCAN_INTERVAL_WHEN_P2P_CONNECTED_MS,

                    Settings.Global.WIFI_SLEEP_POLICY,

                    Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS,

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+0 −6
Original line number Diff line number Diff line
@@ -268,12 +268,6 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,

                GlobalSettingsProto.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST);

        dumpSetting(s, p,

                Settings.Global.WIFI_SCAN_BACKGROUND_THROTTLE_INTERVAL_MS,

                GlobalSettingsProto.WIFI_SCAN_BACKGROUND_THROTTLE_INTERVAL_MS);

        dumpSetting(s, p,

                Settings.Global.WIFI_SCAN_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,

                GlobalSettingsProto.WIFI_SCAN_BACKGROUND_THROTTLE_PACKAGE_WHITELIST);

        dumpSetting(s, p,

                Settings.Global.MHL_INPUT_SWITCHING_ENABLED,

                GlobalSettingsProto.MHL_INPUT_SWITCHING_ENABLED);

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+11 −1
Original line number Diff line number Diff line
@@ -2938,7 +2938,7 @@ public class SettingsProvider extends ContentProvider { 
        }



        private final class UpgradeController {

            private static final int SETTINGS_VERSION = 158;

            private static final int SETTINGS_VERSION = 159;



            private final int mUserId;
@@ -3636,6 +3636,16 @@ public class SettingsProvider extends ContentProvider { 
                    }

                    currentVersion = 158;

                }



                if (currentVersion == 158) {

                    // Remove setting that specifies wifi bgscan throttling params

                    getGlobalSettingsLocked().deleteSettingLocked(

                        "wifi_scan_background_throttle_interval_ms");

                    getGlobalSettingsLocked().deleteSettingLocked(

                        "wifi_scan_background_throttle_package_whitelist");

                    currentVersion = 159;

                }



                // vXXX: Add new settings above this point.



                if (currentVersion != newVersion) {