commit 7fb9a4d538b3691328f2f703a0bacbe2fd1f70bb
author Terry (Woncheol) Heo <terryheo@google.com> Wed Oct 18 04:39:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 18 04:39:53 2017 +0000
tree 72d1ef18de9ddb777c2dce3911b5e001a7834a3a
parent b070d682d14b61db2313bb84545747f38d74f5f8
parent 86e7678b32436e0d04ae7a724732e58ec72caab6

Merge "Fix loading of the default animation settings"

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

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 06d00be..1557d91 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2319,8 +2319,6 @@
             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 @@
             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);