SettingsProvider : Make WIFI_IDLE_MS into an overlay (faf68427) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/res/values/defaults.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -234,4 +234,7 @@

		<!-- Default for Settings.Global.CAPTIVE_PORTAL_DETECTION_ENABLED -->
		<integer name="def_captive_portal_detection_enabled" translatable="false">1</integer>

		<!-- Default for Settings.Global.WIFI_IDLE_MS (15 minutes) -->
		<integer name="default_wifi_idle_ms">900000</integer>
		</resources>

+17 −1

Original line number	Diff line number	Diff line
		@@ -1986,7 +1986,7 @@ public class SettingsProvider extends ContentProvider {
		}

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 122;
		private static final int SETTINGS_VERSION = 123;
		/**
		* This is the 12.1 database version (DO NOT INCREMENT)
		*/
		@@ -2170,6 +2170,22 @@ public class SettingsProvider extends ContentProvider {
		}
		currentVersion = 122;
		}

		if (currentVersion == 122) {
		if (userId == UserHandle.USER_OWNER) {
		final SettingsState globalSettings = getGlobalSettingsLocked();
		Setting currentSetting = globalSettings.getSettingLocked(
		Settings.Global.WIFI_IDLE_MS);
		int defaultComponent = getContext().getResources().getInteger(
		R.integer.default_wifi_idle_ms);
		if (currentSetting == null) {
		globalSettings.insertSettingLocked(Settings.Global.WIFI_IDLE_MS,
		Integer.toString(defaultComponent),
		SettingsState.SYSTEM_PACKAGE_NAME);
		}
		}
		currentVersion = 123;
		}
		// vXXX: Add new settings above this point.

		// Return the current version.