Merge "close SQLiteStatement objects in finally block" (b978c8f8) · Commits · e / os / android_frameworks_base

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

+233 −209

Original line number	Diff line number	Diff line
		@@ -301,18 +301,19 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		* enabled or disabled based on product resources.
		*/
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		db.execSQL("DELETE FROM system WHERE name='"
		+ Settings.System.WINDOW_ANIMATION_SCALE + "'");
		db.execSQL("DELETE FROM system WHERE name='"
		+ Settings.System.TRANSITION_ANIMATION_SCALE + "'");
		SQLiteStatement stmt = db.compileStatement("INSERT INTO system(name,value)"
		stmt = db.compileStatement("INSERT INTO system(name,value)"
		+ " VALUES(?,?);");
		loadDefaultAnimationSettings(stmt);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		upgradeVersion = 32;
		}
		@@ -349,14 +350,15 @@ public class DatabaseHelper extends SQLiteOpenHelper {

		if (upgradeVersion == 34) {
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		SQLiteStatement stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"
		stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"
		+ " VALUES(?,?);");
		loadSecure35Settings(stmt);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		upgradeVersion = 35;
		}
		@@ -391,15 +393,16 @@ public class DatabaseHelper extends SQLiteOpenHelper {

		if (upgradeVersion == 37) {
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		SQLiteStatement stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
		stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
		+ " VALUES(?,?);");
		loadStringSetting(stmt, Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS,
		R.string.airplane_mode_toggleable_radios);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		upgradeVersion = 38;
		}
		@@ -440,18 +443,19 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		* All animations are now turned on by default!
		*/
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		db.execSQL("DELETE FROM system WHERE name='"
		+ Settings.System.WINDOW_ANIMATION_SCALE + "'");
		db.execSQL("DELETE FROM system WHERE name='"
		+ Settings.System.TRANSITION_ANIMATION_SCALE + "'");
		SQLiteStatement stmt = db.compileStatement("INSERT INTO system(name,value)"
		stmt = db.compileStatement("INSERT INTO system(name,value)"
		+ " VALUES(?,?);");
		loadDefaultAnimationSettings(stmt);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		upgradeVersion = 41;
		}
		@@ -461,16 +465,17 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		* Initialize newly public haptic feedback setting
		*/
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		db.execSQL("DELETE FROM system WHERE name='"
		+ Settings.System.HAPTIC_FEEDBACK_ENABLED + "'");
		SQLiteStatement stmt = db.compileStatement("INSERT INTO system(name,value)"
		stmt = db.compileStatement("INSERT INTO system(name,value)"
		+ " VALUES(?,?);");
		loadDefaultHapticSettings(stmt);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		upgradeVersion = 42;
		}
		@@ -480,15 +485,16 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		* Initialize new notification pulse setting
		*/
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		SQLiteStatement stmt = db.compileStatement("INSERT INTO system(name,value)"
		stmt = db.compileStatement("INSERT INTO system(name,value)"
		+ " VALUES(?,?);");
		loadBooleanSetting(stmt, Settings.System.NOTIFICATION_LIGHT_PULSE,
		R.bool.def_notification_pulse);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		upgradeVersion = 43;
		}
		@@ -498,15 +504,16 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		* This upgrade stores bluetooth volume separately from voice volume
		*/
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		SQLiteStatement stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
		stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
		+ " VALUES(?,?);");
		loadSetting(stmt, Settings.System.VOLUME_BLUETOOTH_SCO,
		AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_BLUETOOTH_SCO]);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}
		upgradeVersion = 44;
		}
		@@ -585,14 +592,15 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		* New settings for new user interface noises.
		*/
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		SQLiteStatement stmt = db.compileStatement("INSERT INTO system(name,value)"
		stmt = db.compileStatement("INSERT INTO system(name,value)"
		+ " VALUES(?,?);");
		loadUISoundEffectsSettings(stmt);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}

		upgradeVersion = 50;
		@@ -603,15 +611,16 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		* New settings for set install location UI.
		*/
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		SQLiteStatement stmt = db.compileStatement("INSERT INTO system(name,value)"
		stmt = db.compileStatement("INSERT INTO system(name,value)"
		+ " VALUES(?,?);");
		loadBooleanSetting(stmt, Settings.System.SET_INSTALL_LOCATION,
		R.bool.set_install_location);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}

		upgradeVersion = 51;
		@@ -637,15 +646,16 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		if (upgradeVersion == 52) {
		// new vibration/silent mode settings
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		SQLiteStatement stmt = db.compileStatement("INSERT INTO system(name,value)"
		stmt = db.compileStatement("INSERT INTO system(name,value)"
		+ " VALUES(?,?);");
		loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,
		R.bool.def_vibrate_in_silent);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}

		upgradeVersion = 53;
		@@ -656,15 +666,16 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		* New settings for set install location UI.
		*/
		db.beginTransaction();
		SQLiteStatement stmt = null;
		try {
		SQLiteStatement stmt = db.compileStatement("INSERT INTO system(name,value)"
		stmt = db.compileStatement("INSERT INTO system(name,value)"
		+ " VALUES(?,?);");
		loadIntegerSetting(stmt, Settings.System.DEFAULT_INSTALL_LOCATION,
		R.integer.def_install_location);
		stmt.close();
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		if (stmt != null) stmt.close();
		}

		upgradeVersion = 54;
		@@ -844,7 +855,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		* @param db the database to insert the volume levels into
		*/
		private void loadVolumeLevels(SQLiteDatabase db) {
		SQLiteStatement stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
		SQLiteStatement stmt = null;
		try {
		stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
		+ " VALUES(?,?);");

		loadSetting(stmt, Settings.System.VOLUME_MUSIC,
		@@ -883,8 +896,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		(1 << AudioManager.STREAM_RING) \|
		(1 << AudioManager.STREAM_NOTIFICATION) \|
		(1 << AudioManager.STREAM_SYSTEM)));

		stmt.close();
		} finally {
		if (stmt != null) stmt.close();
		}
		}

		private void loadVibrateSetting(SQLiteDatabase db, boolean deleteOld) {
		@@ -892,7 +906,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		db.execSQL("DELETE FROM system WHERE name='" + Settings.System.VIBRATE_ON + "'");
		}

		SQLiteStatement stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
		SQLiteStatement stmt = null;
		try {
		stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
		+ " VALUES(?,?);");

		// Vibrate off by default for ringer, on for notification
		@@ -902,7 +918,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		vibrate = AudioService.getValueForVibrateSetting(vibrate,
		AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_OFF);
		loadSetting(stmt, Settings.System.VIBRATE_ON, vibrate);
		stmt.close();
		} finally {
		if (stmt != null) stmt.close();
		}
		}

		private void loadSettings(SQLiteDatabase db) {
		@@ -911,7 +929,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		}

		private void loadSystemSettings(SQLiteDatabase db) {
		SQLiteStatement stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
		SQLiteStatement stmt = null;
		try {
		stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
		+ " VALUES(?,?);");

		loadBooleanSetting(stmt, Settings.System.DIM_SCREEN,
		@@ -972,8 +992,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {

		loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,
		R.bool.def_vibrate_in_silent);

		stmt.close();
		} finally {
		if (stmt != null) stmt.close();
		}
		}

		private void loadUISoundEffectsSettings(SQLiteStatement stmt) {
		@@ -1014,7 +1035,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		}

		private void loadSecureSettings(SQLiteDatabase db) {
		SQLiteStatement stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"
		SQLiteStatement stmt = null;
		try {
		stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"
		+ " VALUES(?,?);");

		loadBooleanSetting(stmt, Settings.Secure.BLUETOOTH_ON,
		@@ -1085,8 +1108,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {

		loadBooleanSetting(stmt, Settings.Secure.MOUNT_UMS_NOTIFY_ENABLED,
		R.bool.def_mount_ums_notify_enabled);

		stmt.close();
		} finally {
		if (stmt != null) stmt.close();
		}
		}

		private void loadSecure35Settings(SQLiteStatement stmt) {