Merge "Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB." (9413c200) · Commits · e / os / android_frameworks_base

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

+29 −2

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		// database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion'
		// is properly propagated through your change. Not doing so will result in a loss of user
		// settings.
		private static final int DATABASE_VERSION = 74;
		private static final int DATABASE_VERSION = 75;

		private Context mContext;

		@@ -987,6 +987,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		}

		if (upgradeVersion == 73) {
		upgradeVibrateSettingFromNone(db);
		upgradeVersion = 74;
		}

		if (upgradeVersion == 74) {
		// URL from which WebView loads a JavaScript based screen-reader.
		db.beginTransaction();
		SQLiteStatement stmt = null;
		@@ -999,7 +1004,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		upgradeVersion = 74;
		upgradeVersion = 75;
		}

		// *** Remember to update DATABASE_VERSION above!
		@@ -1107,6 +1112,28 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		}
		}

		private void upgradeVibrateSettingFromNone(SQLiteDatabase db) {
		int vibrateSetting = getIntValueFromSystem(db, Settings.System.VIBRATE_ON, 0);
		// If the ringer vibrate value is invalid, set it to the default
		if ((vibrateSetting & 3) == AudioManager.VIBRATE_SETTING_OFF) {
		vibrateSetting = AudioService.getValueForVibrateSetting(0,
		AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_ONLY_SILENT);
		}
		// Apply the same setting to the notification vibrate value
		vibrateSetting = AudioService.getValueForVibrateSetting(vibrateSetting,
		AudioManager.VIBRATE_TYPE_NOTIFICATION, vibrateSetting);

		SQLiteStatement stmt = null;
		try {
		stmt = db.compileStatement("INSERT OR REPLACE INTO system(name,value)"
		+ " VALUES(?,?);");
		loadSetting(stmt, Settings.System.VIBRATE_ON, vibrateSetting);
		} finally {
		if (stmt != null)
		stmt.close();
		}
		}

		private void upgradeScreenTimeout(SQLiteDatabase db) {
		// Change screen timeout to current default
		db.beginTransaction();