diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-06-25 17:09:24 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-25 17:09:24 -0700 |
commit | 5d88c14cd39d1100e28f7e340874655ab7a42904 (patch) | |
tree | de234da182c46670c269f7dc95ac4f1bdbcdd66a /packages/SettingsProvider | |
parent | fcd7cf2a24eaff85085fde58dc8c69f8ff374575 (diff) | |
parent | 3a67eb3be43bfd1f7735cf018c4cb552c6cbba08 (diff) | |
download | frameworks_base-5d88c14cd39d1100e28f7e340874655ab7a42904.zip frameworks_base-5d88c14cd39d1100e28f7e340874655ab7a42904.tar.gz frameworks_base-5d88c14cd39d1100e28f7e340874655ab7a42904.tar.bz2 |
Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 19 |
1 files changed, 18 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 b0939de..2594167 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -63,7 +63,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 = 78; + private static final int DATABASE_VERSION = 79; private Context mContext; @@ -1054,6 +1054,23 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 78; } + if (upgradeVersion == 78) { + // The JavaScript based screen-reader URL changes in JellyBean. + db.beginTransaction(); + SQLiteStatement stmt = null; + try { + stmt = db.compileStatement("INSERT OR REPLACE INTO secure(name,value)" + + " VALUES(?,?);"); + loadStringSetting(stmt, Settings.Secure.ACCESSIBILITY_SCREEN_READER_URL, + R.string.def_accessibility_screen_reader_url); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + if (stmt != null) stmt.close(); + } + upgradeVersion = 79; + } + // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != currentVersion) { |