diff options
| author | Tomasz Wasilczyk <twasilczyk@google.com> | 2021-01-30 00:55:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-30 00:55:53 +0000 |
| commit | 13466883b0967d6d4a124e2fce2a8702b58c90df (patch) | |
| tree | 2309d354973bf0fbcb5608cdff44a6a0901b23e0 | |
| parent | 6857f6ed91b99b2f6c38cec9afb4f7f1d962acd3 (diff) | |
| parent | 1e036b6d352de7900e7d2d066cf8a64b3e40390c (diff) | |
Merge "Fix initialization of USER_ROTATION setting."
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 266bfe0a22b5..6568bffddecc 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -846,8 +846,8 @@ class DatabaseHelper extends SQLiteOpenHelper { try { stmt = db.compileStatement("INSERT INTO system(name,value)" + " VALUES(?,?);"); - loadBooleanSetting(stmt, Settings.System.USER_ROTATION, - R.integer.def_user_rotation); // should be zero degrees + loadIntegerSetting(stmt, Settings.System.USER_ROTATION, + R.integer.def_user_rotation); db.setTransactionSuccessful(); } finally { db.endTransaction(); @@ -2265,6 +2265,8 @@ class DatabaseHelper extends SQLiteOpenHelper { loadBooleanSetting(stmt, Settings.System.ACCELEROMETER_ROTATION, R.bool.def_accelerometer_rotation); + loadIntegerSetting(stmt, Settings.System.USER_ROTATION, R.integer.def_user_rotation); + loadDefaultHapticSettings(stmt); loadBooleanSetting(stmt, Settings.System.NOTIFICATION_LIGHT_PULSE, |