Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 24464 into eclair

Browse Source 
* changes:
  Fix for bug # 2023074: settings db updater broken at version 34.
This commit is contained in:
Android (Google) Code Review
2009-09-10 14:09:54 -04:00
parent d9ca6a79c6 f186055a53
commit dc9555fb64
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -25,6 +25,8 @@ import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDoneException;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteStatement; import android.database.sqlite.SQLiteStatement;
import android.media.AudioManager; import android.media.AudioManager;
@@ -64,6 +66,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
private static final String TAG = "SettingsProvider"; private static final String TAG = "SettingsProvider";
private static final String DATABASE_NAME = "settings.db"; 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 static final int DATABASE_VERSION = 39;
private Context mContext; private Context mContext;
@@ -397,6 +404,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
} finally { } finally {
db.endTransaction(); db.endTransaction();
} }
upgradeVersion = 35;
} }
// due to a botched merge from donut to eclair, the initialization of ASSISTED_GPS_ENABLED // due to a botched merge from donut to eclair, the initialization of ASSISTED_GPS_ENABLED
// was accidentally done out of order here. // was accidentally done out of order here.