Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa601425 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Al Sutton
Browse files

BACKPORT: 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
parent 751fb2d2

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -849,8 +849,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();
@@ -2269,6 +2269,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,