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

Merge "Fix initialization of USER_ROTATION setting."

Browse Source
This commit is contained in:
Tomasz Wasilczyk
2021-01-30 00:55:53 +00:00
committed by Gerrit Code Review
parent 6857f6ed91 1e036b6d35
commit 13466883b0
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 { try {
stmt = db.compileStatement("INSERT INTO system(name,value)" stmt = db.compileStatement("INSERT INTO system(name,value)"
+ " VALUES(?,?);"); + " VALUES(?,?);");
loadBooleanSetting(stmt, Settings.System.USER_ROTATION, loadIntegerSetting(stmt, Settings.System.USER_ROTATION,
R.integer.def_user_rotation); // should be zero degrees R.integer.def_user_rotation);
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();
@@ -2265,6 +2265,8 @@ class DatabaseHelper extends SQLiteOpenHelper {
loadBooleanSetting(stmt, Settings.System.ACCELEROMETER_ROTATION, loadBooleanSetting(stmt, Settings.System.ACCELEROMETER_ROTATION,
R.bool.def_accelerometer_rotation); R.bool.def_accelerometer_rotation);
loadIntegerSetting(stmt, Settings.System.USER_ROTATION, R.integer.def_user_rotation);
loadDefaultHapticSettings(stmt); loadDefaultHapticSettings(stmt);
loadBooleanSetting(stmt, Settings.System.NOTIFICATION_LIGHT_PULSE, loadBooleanSetting(stmt, Settings.System.NOTIFICATION_LIGHT_PULSE,