Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix initialization of USER_ROTATION setting." am: 13466883b0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554929

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7551b1ce3883e85c0da8376424aeb9814a8832be
This commit is contained in:
Tomasz Wasilczyk
2021-01-30 02:17:19 +00:00
committed by Automerger Merge Worker
parent 95244bedc7 13466883b0
commit 9768739095
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -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,