drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE." into jb-mr1-dev

Browse Source
This commit is contained in:
John Spurlock
2012-10-05 10:31:05 -07:00
committed by Android (Google) Code Review
parent 5b5d31b19b 7f1c248e80
commit fcfd3e68ab
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsProvider/res/values/defaults.xml
View File

@ -174,4 +174,7 @@
<bool name="def_screensaver_activate_on_sleep">false</bool>
<!-- ComponentName of the default screen saver (Settings.Secure.SCREENSAVER_COMPONENT) -->
<string name="def_screensaver_component">com.google.android.deskclock/com.android.deskclock.Screensaver</string>
<!-- Default for Settings.Secure.USER_SETUP_COMPLETE -->
<bool name="def_user_setup_complete">false</bool>
</resources>

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

@ -68,7 +68,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 = 92;
private static final int DATABASE_VERSION = 93;
private Context mContext;
private int mUserHandle;
@ -1449,6 +1449,30 @@ public class DatabaseHelper extends SQLiteOpenHelper {
upgradeVersion = 92;
}
if (upgradeVersion == 92) {
SQLiteStatement stmt = null;
try {
stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"
+ " VALUES(?,?);");
if (mUserHandle == UserHandle.USER_OWNER) {
// consider existing primary users to have made it through user setup
// if the globally-scoped device-provisioned bit is set
// (indicating they already made it through setup as primary)
int deviceProvisioned = getIntValueFromTable(db, TABLE_GLOBAL,
Settings.Global.DEVICE_PROVISIONED, 0);
loadSetting(stmt, Settings.Secure.USER_SETUP_COMPLETE,
deviceProvisioned);
} else {
// otherwise use the default
loadBooleanSetting(stmt, Settings.Secure.USER_SETUP_COMPLETE,
R.bool.def_user_setup_complete);
}
} finally {
if (stmt != null) stmt.close();
}
upgradeVersion = 93;
}
// *** Remember to update DATABASE_VERSION above!
if (upgradeVersion != currentVersion) {
@ -2016,6 +2040,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadBooleanSetting(stmt,
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE,
R.bool.def_accessibility_display_magnification_auto_update);
loadBooleanSetting(stmt, Settings.Secure.USER_SETUP_COMPLETE,
R.bool.def_user_setup_complete);
} finally {
if (stmt != null) stmt.close();
}