diff options
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 1fbe08d..a5e3483 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -63,7 +63,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 = 73; + private static final int DATABASE_VERSION = 74; private Context mContext; @@ -986,6 +986,12 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 73; } + if (upgradeVersion == 73) { + // update vibration settings + upgradeVibrateSettingFromNone(db); + upgradeVersion = 74; + } + // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != currentVersion) { @@ -1091,6 +1097,28 @@ public class DatabaseHelper extends SQLiteOpenHelper { } } + private void upgradeVibrateSettingFromNone(SQLiteDatabase db) { + int vibrateSetting = getIntValueFromSystem(db, Settings.System.VIBRATE_ON, 0); + // If the ringer vibrate value is invalid, set it to the default + if ((vibrateSetting & 3) == AudioManager.VIBRATE_SETTING_OFF) { + vibrateSetting = AudioService.getValueForVibrateSetting(0, + AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_ONLY_SILENT); + } + // Apply the same setting to the notification vibrate value + vibrateSetting = AudioService.getValueForVibrateSetting(vibrateSetting, + AudioManager.VIBRATE_TYPE_NOTIFICATION, vibrateSetting); + + SQLiteStatement stmt = null; + try { + stmt = db.compileStatement("INSERT OR REPLACE INTO system(name,value)" + + " VALUES(?,?);"); + loadSetting(stmt, Settings.System.VIBRATE_ON, vibrateSetting); + } finally { + if (stmt != null) + stmt.close(); + } + } + private void upgradeScreenTimeout(SQLiteDatabase db) { // Change screen timeout to current default db.beginTransaction(); |