Merge "Enable wifi wake for all P devices." (92deeffd) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -436,7 +436,7 @@
		0 = Not available.
		1 = Available.
		-->
		<integer translatable="false" name="config_wifi_wakeup_available">0</integer>
		<integer translatable="false" name="config_wifi_wakeup_available">1</integer>

		<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering.

+14 −1

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

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 151;
		private static final int SETTINGS_VERSION = 152;

		private final int mUserId;

		@@ -3620,6 +3620,19 @@ public class SettingsProvider extends ContentProvider {
		currentVersion = 151;
		}

		if (currentVersion == 151) {
		// Version 152: Reset wifi wake available for upgrading users
		final SettingsState globalSettings = getGlobalSettingsLocked();
		final int defaultValue = getContext().getResources().getInteger(
		com.android.internal.R.integer.config_wifi_wakeup_available);
		globalSettings.insertSettingLocked(
		Settings.Global.WIFI_WAKEUP_AVAILABLE,
		String.valueOf(defaultValue),
		null, true, SettingsState.SYSTEM_PACKAGE_NAME);

		currentVersion = 152;
		}

		// vXXX: Add new settings above this point.

		if (currentVersion != newVersion) {