diff options
author | Jim Miller <jaggies@google.com> | 2009-09-09 17:46:35 -0700 |
---|---|---|
committer | Jim Miller <jaggies@google.com> | 2009-09-09 19:10:57 -0700 |
commit | f186055a53758fd4112ab3c470cda6337a18fa33 (patch) | |
tree | 8389f2025039b684c2bc9d3ece4af453b520b7e3 /packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | |
parent | f416264a3b13c5965bfe1c75e9fb2a480d556f87 (diff) | |
download | frameworks_base-f186055a53758fd4112ab3c470cda6337a18fa33.zip frameworks_base-f186055a53758fd4112ab3c470cda6337a18fa33.tar.gz frameworks_base-f186055a53758fd4112ab3c470cda6337a18fa33.tar.bz2 |
Fix for bug # 2023074: settings db updater broken at version 34.
Diffstat (limited to 'packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java')
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 8f4061e..2524a30 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -25,6 +25,8 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteDoneException; +import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteStatement; import android.media.AudioManager; @@ -64,6 +66,11 @@ public class DatabaseHelper extends SQLiteOpenHelper { private static final String TAG = "SettingsProvider"; private static final String DATABASE_NAME = "settings.db"; + + // Please, please please. If you update the database version, check to make sure the + // 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 = 39; private Context mContext; @@ -397,6 +404,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { } finally { db.endTransaction(); } + upgradeVersion = 35; } // due to a botched merge from donut to eclair, the initialization of ASSISTED_GPS_ENABLED // was accidentally done out of order here. |