diff options
author | Amith Yamasani <yamasani@google.com> | 2011-08-04 15:51:32 -0700 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2011-08-04 15:51:32 -0700 |
commit | e6087d771543e896888249ddd7dcc638ce70a2a0 (patch) | |
tree | 919155e1ed330bed0cb85369b5bd7c05e3e7e70d /packages/SettingsProvider | |
parent | 01704e76fa52805f6e739fc0d8e63f403e74bfa8 (diff) | |
download | frameworks_base-e6087d771543e896888249ddd7dcc638ce70a2a0.zip frameworks_base-e6087d771543e896888249ddd7dcc638ce70a2a0.tar.gz frameworks_base-e6087d771543e896888249ddd7dcc638ce70a2a0.tar.bz2 |
Don't change system sound defaults for upgrades.
This reverts an earlier change that reset the system sound defaults even
for upgrades.
Bug: 5114198
Change-Id: Ide0afbd26080ba87d177cedfa9b1d50352857a00
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 8 |
1 files changed, 0 insertions, 8 deletions
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 @@ public class DatabaseHelper extends SQLiteOpenHelper { 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; } |