Merge "Update wifi_wakeup_available default setting." (5837e312) · Commits · e / os / android_frameworks_base

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

+14 −11

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

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 145;
		private static final int SETTINGS_VERSION = 146;

		private final int mUserId;

		@@ -3482,12 +3482,16 @@ public class SettingsProvider extends ContentProvider {
		}

		if (currentVersion == 144) {
		// Version 145: Set the default value for WIFI_WAKEUP_AVAILABLE.
		// Version 145: Removed
		currentVersion = 145;
		}

		if (currentVersion == 145) {
		// Version 146: Set the default value for WIFI_WAKEUP_AVAILABLE.
		if (userId == UserHandle.USER_SYSTEM) {
		final SettingsState globalSettings = getGlobalSettingsLocked();
		final Setting currentSetting = globalSettings.getSettingLocked(
		Settings.Global.WIFI_WAKEUP_AVAILABLE);
		if (currentSetting.isNull()) {
		final int defaultValue = getContext().getResources().getInteger(
		com.android.internal.R.integer.config_wifi_wakeup_available);
		globalSettings.insertSettingLocked(
		@@ -3495,9 +3499,8 @@ public class SettingsProvider extends ContentProvider {
		String.valueOf(defaultValue),
		null, true, SettingsState.SYSTEM_PACKAGE_NAME);
		}
		}

		currentVersion = 145;
		currentVersion = 146;
		}

		// vXXX: Add new settings above this point.