Merge "Enable Wifi Wakeup Setting by default." (16456e5a) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/res/values/defaults.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@
		<bool name="def_wifi_on">false</bool>
		<!-- 0 == never, 1 == only when plugged in, 2 == always -->
		<integer name="def_wifi_sleep_policy">2</integer>
		<bool name="def_wifi_wakeup_enabled">false</bool>
		<bool name="def_wifi_wakeup_enabled">true</bool>
		<bool name="def_networks_available_notification_on">true</bool>

		<bool name="def_backup_enabled">false</bool>

+22 −2

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

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 142;
		private static final int SETTINGS_VERSION = 143;

		private final int mUserId;

		@@ -3343,10 +3343,30 @@ public class SettingsProvider extends ContentProvider {
		currentVersion = 142;
		}

		if (currentVersion == 142) {
		// Version 142: Set a default value for Wi-Fi wakeup feature.
		if (userId == UserHandle.USER_SYSTEM) {
		final SettingsState globalSettings = getGlobalSettingsLocked();
		Setting currentSetting = globalSettings.getSettingLocked(
		Settings.Global.WIFI_WAKEUP_ENABLED);
		if (currentSetting.isNull()) {
		globalSettings.insertSettingLocked(
		Settings.Global.WIFI_WAKEUP_ENABLED,
		getContext().getResources().getBoolean(
		R.bool.def_wifi_wakeup_enabled) ? "1" : "0",
		null, true, SettingsState.SYSTEM_PACKAGE_NAME);
		}
		}

		currentVersion = 143;
		}

		if (currentVersion != newVersion) {
		Slog.wtf("SettingsProvider", "warning: upgrading settings database to version "
		+ newVersion + " left it at "
		+ currentVersion + " instead; this is probably a bug", new Throwable());
		+ currentVersion +
		" instead; this is probably a bug. Did you update SETTINGS_VERSION?",
		new Throwable());
		if (DEBUG) {
		throw new RuntimeException("db upgrade error");
		}