Merge "Settings db upgrade steps only apply to the owner user" into jb-mr1-dev (303309cb) · Commits · e / os / android_frameworks_base

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

+74 −63

Original line number	Diff line number	Diff line
		@@ -1202,6 +1202,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {

		if (upgradeVersion == 82) {
		// Move to per-user settings dbs
		if (mUserHandle == UserHandle.USER_OWNER) {

		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		@@ -1218,6 +1220,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		}
		upgradeVersion = 83;
		}

		@@ -1251,6 +1254,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		}

		if (upgradeVersion == 84) {
		if (mUserHandle == UserHandle.USER_OWNER) {
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		@@ -1270,10 +1274,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		}
		upgradeVersion = 85;
		}

		if (upgradeVersion == 85) {
		if (mUserHandle == UserHandle.USER_OWNER) {
		db.beginTransaction();
		try {
		// Fix up the migration, ignoring already-migrated elements, to snap up to
		@@ -1285,10 +1291,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		} finally {
		db.endTransaction();
		}
		}
		upgradeVersion = 86;
		}

		if (upgradeVersion == 86) {
		if (mUserHandle == UserHandle.USER_OWNER) {
		db.beginTransaction();
		try {
		String[] settingsToMove = {
		@@ -1302,10 +1310,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		} finally {
		db.endTransaction();
		}
		}
		upgradeVersion = 87;
		}

		if (upgradeVersion == 87) {
		if (mUserHandle == UserHandle.USER_OWNER) {
		db.beginTransaction();
		try {
		String[] settingsToMove = {
		@@ -1319,6 +1329,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		} finally {
		db.endTransaction();
		}
		}
		upgradeVersion = 88;
		}