Merge "Fix loading of the default animation settings"

2017-10-18 04:39:53 +00:00
parent b070d682d1 86e7678b32
commit 7fb9a4d538
1 changed files with 2 additions and 2 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2319,8 +2319,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
            loadBooleanSetting(stmt, Settings.System.SCREEN_BRIGHTNESS_MODE,
                    R.bool.def_screen_brightness_automatic_mode);

-            loadDefaultAnimationSettings(stmt);
-
            loadBooleanSetting(stmt, Settings.System.ACCELEROMETER_ROTATION,
                    R.bool.def_accelerometer_rotation);

@@ -2514,6 +2512,8 @@ class DatabaseHelper extends SQLiteOpenHelper {
            loadSetting(stmt, Settings.Global.MODE_RINGER,
                    AudioManager.RINGER_MODE_NORMAL);

+            loadDefaultAnimationSettings(stmt);
+
            // --- Previously in 'secure'
            loadBooleanSetting(stmt, Settings.Global.PACKAGE_VERIFIER_ENABLE,
                    R.bool.def_package_verifier_enable);