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

Commit ddd7e44f authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents f1d1b8b7 fa601425
Loading
Loading
Loading
Loading
+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,