Fix for bug # 2023074: settings db updater broken at version 34.
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.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 @@
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 @@
} 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.
