am 0e19e2b2: am e1331779: am 95a321fc: Merge "Fix for Never not existing in... (6ad28aff) · Commits · e / os / android_frameworks_base

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

+39 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,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 = 54;
		private static final int DATABASE_VERSION = 55;

		private Context mContext;

		@@ -681,6 +681,21 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		upgradeVersion = 54;
		}

		if (upgradeVersion == 54) {
		/*
		* Update the screen timeout value if set to never
		*/
		db.beginTransaction();
		try {
		upgradeScreenTimeoutFromNever(db);
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		}

		upgradeVersion = 55;
		}

		// *** Remember to update DATABASE_VERSION above!

		if (upgradeVersion != currentVersion) {
		@@ -762,6 +777,29 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		}
		}

		private void upgradeScreenTimeoutFromNever(SQLiteDatabase db) {
		// See if the timeout is -1 (for "Never").
		Cursor c = db.query("system", new String[] { "_id", "value" }, "name=? AND value=?",
		new String[] { Settings.System.SCREEN_OFF_TIMEOUT, "-1" },
		null, null, null);

		SQLiteStatement stmt = null;
		if (c.getCount() > 0) {
		c.close();
		try {
		stmt = db.compileStatement("INSERT OR REPLACE INTO system(name,value)"
		+ " VALUES(?,?);");

		// Set the timeout to 30 minutes in milliseconds
		loadIntegerSetting(stmt, Settings.System.SCREEN_OFF_TIMEOUT, 30 * 60 * 1000);
		} finally {
		if (stmt != null) stmt.close();
		}
		} else {
		c.close();
		}
		}

		/**
		* Loads the default set of bookmarked shortcuts from an xml file.
		*