Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev (5d88c14c) · Commits · e / os / android_frameworks_base

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

+18 −1

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 = 78;
		private static final int DATABASE_VERSION = 79;

		private Context mContext;

		@@ -1054,6 +1054,23 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		upgradeVersion = 78;
		}

		if (upgradeVersion == 78) {
		// The JavaScript based screen-reader URL changes in JellyBean.
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		stmt = db.compileStatement("INSERT OR REPLACE INTO secure(name,value)"
		+ " VALUES(?,?);");
		loadStringSetting(stmt, Settings.Secure.ACCESSIBILITY_SCREEN_READER_URL,
		R.string.def_accessibility_screen_reader_url);
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		upgradeVersion = 79;
		}

		// *** Remember to update DATABASE_VERSION above!

		if (upgradeVersion != currentVersion) {