diff options
author | Jason Monk <jmonk@google.com> | 2014-11-03 14:41:07 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-03 14:41:07 +0000 |
commit | 5c69f5b276b65bd4b8000d2b6e56baddccf89846 (patch) | |
tree | 2c78f0a3440f79788ede6fcbe2cb838ebd9df8ef /packages/SettingsProvider | |
parent | 726e9ea7322d5122a22a0077d58ae92870962df4 (diff) | |
parent | 2e647efe01dcdb82d2d7f8a23540ba6b690a95d6 (diff) | |
download | frameworks_base-5c69f5b276b65bd4b8000d2b6e56baddccf89846.zip frameworks_base-5c69f5b276b65bd4b8000d2b6e56baddccf89846.tar.gz frameworks_base-5c69f5b276b65bd4b8000d2b6e56baddccf89846.tar.bz2 |
am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
* commit '2e647efe01dcdb82d2d7f8a23540ba6b690a95d6':
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 16 |
1 files changed, 15 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 eea97ea..9bfcadb 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -71,7 +71,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 = 116; + private static final int DATABASE_VERSION = 117; private Context mContext; private int mUserHandle; @@ -1865,6 +1865,20 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 116; } + if (upgradeVersion < 117) { + db.beginTransaction(); + try { + String[] systemToSecure = { + Settings.Secure.LOCK_TO_APP_EXIT_LOCKED + }; + moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_SECURE, systemToSecure, true); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + upgradeVersion = 117; + } + // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != currentVersion) { |