Merge "Flip flag to enable vibration on wireless charging" into pi-dev (9b3ff51d) · Commits · e / os / android_frameworks_base

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

+14 −1

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

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 167;
		private static final int SETTINGS_VERSION = 168;

		private final int mUserId;

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

		if (currentVersion == 167) {
		// Version 167: by default, vibrate for wireless charging
		final SettingsState globalSettings = getGlobalSettingsLocked();
		final Setting currentSetting = globalSettings.getSettingLocked(
		Global.CHARGING_VIBRATION_ENABLED);
		if (currentSetting.isNull()) {
		globalSettings.insertSettingLocked(
		Global.CHARGING_VIBRATION_ENABLED, "1",
		null, true, SettingsState.SYSTEM_PACKAGE_NAME);
		}
		currentVersion = 168;
		}

		// vXXX: Add new settings above this point.

		if (currentVersion != newVersion) {