diff options
| author | Daniel Sandler <dsandler@google.com> | 2010-03-10 09:45:01 -0500 |
|---|---|---|
| committer | Daniel Sandler <dsandler@google.com> | 2010-03-10 15:01:25 -0500 |
| commit | 1c7fa4836bfa7ff61f176461ca0557e90f714121 (patch) | |
| tree | 596161fd0b8751af5a2f3bfb428386159360712f /packages/SettingsProvider/src | |
| parent | 746f666029f67cbb3d9e274d718ab7d88e8455cd (diff) | |
| download | frameworks_base-1c7fa4836bfa7ff61f176461ca0557e90f714121.zip frameworks_base-1c7fa4836bfa7ff61f176461ca0557e90f714121.tar.gz frameworks_base-1c7fa4836bfa7ff61f176461ca0557e90f714121.tar.bz2 | |
Add VIBRATE_IN_SILENT to the settings database & backup.
Change-Id: Id31e24ef0536278ccb66b22bba7ed2b47eb1a371
Diffstat (limited to 'packages/SettingsProvider/src')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b05f1b3..edf3923 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -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 = 52; + private static final int DATABASE_VERSION = 53; private Context mContext; @@ -634,7 +634,26 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 52; } - if (upgradeVersion != currentVersion) { + if (upgradeVersion == 52) { + // new vibration/silent mode settings + db.beginTransaction(); + try { + SQLiteStatement 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(); + } + + upgradeVersion = 53; + } + + // *** Remember to update DATABASE_VERSION above! + + if (upgradeVersion != currentVersion) { Log.w(TAG, "Got stuck trying to upgrade from version " + upgradeVersion + ", must wipe the settings provider"); db.execSQL("DROP TABLE IF EXISTS system"); @@ -930,6 +949,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadUISoundEffectsSettings(stmt); + loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT, + R.bool.def_vibrate_in_silent); + stmt.close(); } |
