Merge "Don't change system sound defaults for upgrades."
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index f527447..f4890e0 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -907,20 +907,12 @@
if (upgradeVersion == 68) {
// Enable all system sounds by default
db.beginTransaction();
- SQLiteStatement stmt = null;
try {
- stmt = db.compileStatement("INSERT OR REPLACE INTO system(name,value)"
- + " VALUES(?,?);");
- loadDefaultHapticSettings(stmt);
- loadUISoundEffectsSettings(stmt);
db.execSQL("DELETE FROM system WHERE name='"
+ Settings.System.NOTIFICATIONS_USE_RING_VOLUME + "'");
- stmt.close();
db.setTransactionSuccessful();
} finally {
db.endTransaction();
- if (stmt != null)
- stmt.close();
}
upgradeVersion = 69;
}