Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev
automerge: e586ab7
* commit 'e586ab79670b6fabfa80f1f29ecb184f97f06f72':
Reset rotation-lock-for-accessibility setting on upgrade.
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 9bfcadb..ddf24e8 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 @@
// 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 = 117;
+ private static final int DATABASE_VERSION = 118;
private Context mContext;
private int mUserHandle;
@@ -1879,6 +1879,22 @@
upgradeVersion = 117;
}
+ if (upgradeVersion < 118) {
+ // Reset rotation-lock-for-accessibility on upgrade, since it now hides the display
+ // setting.
+ db.beginTransaction();
+ SQLiteStatement stmt = null;
+ try {
+ stmt = db.compileStatement("INSERT OR REPLACE INTO system(name,value)"
+ + " VALUES(?,?);");
+ loadSetting(stmt, Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 0);
+ db.setTransactionSuccessful();
+ } finally {
+ db.endTransaction();
+ if (stmt != null) stmt.close();
+ }
+ upgradeVersion = 118;
+ }
// *** Remember to update DATABASE_VERSION above!
if (upgradeVersion != currentVersion) {