From 1e036b6d352de7900e7d2d066cf8a64b3e40390c Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Wed, 20 Jan 2021 11:58:56 -0800 Subject: [PATCH] Fix initialization of USER_ROTATION setting. Until now, def_user_rotation was effectively a dead default: - added missing def_user_rotation -> USER_ROTATION first-run initialization - corrected the setting type when upgrading database Bug: 178000973 Test: set def_user_rotation to 1 in default.xml and flash Pixel 3a Change-Id: If2aa9665a0167f696f6b16a16be48ac473271631 --- .../src/com/android/providers/settings/DatabaseHelper.java | 6 ++++-- 1 file 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 266bfe0a22b55..6568bffddecc7 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,