diff options
| author | John Spurlock <jspurlock@google.com> | 2014-11-07 20:55:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-07 20:55:24 +0000 |
| commit | 1e64aa3382f6d25a6ac2231f861c25ecca328285 (patch) | |
| tree | bb7b819e590c8198a5fd352a817c8ad545f4d530 /packages | |
| parent | d0062deacc3edcab2aa0b9da94d6605f2080ef66 (diff) | |
| parent | e586ab79670b6fabfa80f1f29ecb184f97f06f72 (diff) | |
| download | frameworks_base-1e64aa3382f6d25a6ac2231f861c25ecca328285.zip frameworks_base-1e64aa3382f6d25a6ac2231f861c25ecca328285.tar.gz frameworks_base-1e64aa3382f6d25a6ac2231f861c25ecca328285.tar.bz2 | |
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.
Diffstat (limited to 'packages')
| -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) { |