diff options
author | John Spurlock <jspurlock@google.com> | 2014-11-07 15:14:21 -0500 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2014-11-07 15:14:21 -0500 |
commit | 8c51d0b7114c4ad9e270ba1f9d6c15d59a8b5b42 (patch) | |
tree | f4ff37e62dee58613efe2a20d696d125a03936e3 /packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | |
parent | d69dacb06f98e85f5624737f376e89108f11cb23 (diff) | |
download | frameworks_base-8c51d0b7114c4ad9e270ba1f9d6c15d59a8b5b42.zip frameworks_base-8c51d0b7114c4ad9e270ba1f9d6c15d59a8b5b42.tar.gz frameworks_base-8c51d0b7114c4ad9e270ba1f9d6c15d59a8b5b42.tar.bz2 |
Reset rotation-lock-for-accessibility setting on upgrade.
Since it now hides the display setting, force the user to opt-in
again.
Bug: 18104538
Change-Id: I4cac947f7a35ba0f578d059542401dcc5d169307
Diffstat (limited to 'packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java')
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 18 |
1 files changed, 17 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 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 @@ 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 = 117; + private static final int DATABASE_VERSION = 118; private Context mContext; private int mUserHandle; @@ -1879,6 +1879,22 @@ public class DatabaseHelper extends SQLiteOpenHelper { 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) { |