Android8.1 OTA升级之后Settings 新添加键值没有初始化

软件平台：Android8.1

硬件平台：展讯

问题：系统升级后，新添加的Settings键值没有更新至系统，经查发现Settings的数据库更新在SettingsProvider有更新触发条件，就是SETTINGS_VERSION和currentVersion两个值，这俩值是一个同步递增的过程，如果SettingsProvider更新了一些键值，而不递增SETTINGS_VERSION的值，升级后就不会触发更新，具体改动如下：

--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2899,7 +2899,7 @@ public class SettingsProvider extends ContentProvider {
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 148;
+            private static final int SETTINGS_VERSION = 149;
 
             private final int mUserId;
 
@@ -3458,6 +3458,30 @@ public class SettingsProvider extends ContentProvider {
                     }
@@ -3458,6 +3458,30 @@ public class SettingsProvider extends ContentProvider {
                     }
                     currentVersion = 148;
                 }
+                if (currentVersion == 148) {
+                    // Version 148: Add default end button behavior
+
+                    final SettingsState systemSettings = getSystemSettingsLocked(userId);
+                    if (systemSettings.getSettingLocked(Settings.System.XF_NOTIFICATION_ON).isNull()) {
+                        String def_notion = Integer.toString(getContext()
+                                .getResources().getInteger(R.integer.xf_notification_on));
+                        systemSettings.insertSettingLocked(Settings.System.XF_NOTIFICATION_ON,
+                                def_notion, null, true,
+                                SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
+
+                    if (systemSettings.getSettingLocked(Settings.System.XF_NOTIFICATION_TONE_ON).isNull()) {
+                        String def_notion_tone = Integer.toString(getContext()
+                                .getResources().getInteger(R.integer.xf_notification_tone_on));
+                        systemSettings.insertSettingLocked(Settings.System.XF_NOTIFICATION_TONE_ON,
+                                def_notion_tone, null, true,
+                                SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
+
+                    currentVersion = 149;
+                }

这样的话，在OTA升级完成后会更新db数据库，完美解决～～～