Android Q 无法同步网络时间

原生settings无法通过网络同步网络时间，查看原因，是由于Ntp服务器有误导致，现将修改记录如下
android/frameworks/base/packages/SettingsProvider

 packages/SettingsProvider/res/values/defaults.xml           |  6 +++++-
 .../src/com/android/providers/settings/DatabaseHelper.java  |  4 ++++
 .../com/android/providers/settings/SettingsProvider.java    | 13 +++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index cdc199b..b6051c3 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -27,7 +27,7 @@
     bluetooth,wifi,nfc
     0
     true
-    true
+    false
     false
     
     102
@@ -221,6 +221,10 @@
     
     persist.vendor.ntp.svr_2
 
+    
+    
+    ntp1.aliyun.com
+
     
     true
 
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 3404314..f812640 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2624,6 +2624,10 @@ class DatabaseHelper extends SQLiteOpenHelper {
 	    loadStringSetting(stmt, Settings.Global.NTP_SERVER_2,
                     R.string.def_ntp_server_2);
 
+	    //Add by hhuiming begain for ID1007319 Fix the problem of unable to synchronize network time
+            loadStringSetting(stmt, Settings.Global.NTP_SERVER,
+                    R.string.def_ntp_server);
+	    //Add by hhuiming end
             /*
              * importANT: Do not add any more upgrade steps here as the global,
              * secure, and system settings are no longer stored in a database
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 8371cb3..2d1f5c8 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -4151,6 +4151,19 @@ public class SettingsProvider extends ContentProvider {
                                         R.string.def_ntp_server_2),
                                 null, true, SettingsState.SYSTEM_PACKAGE_NAME);
                     }
+
+		   //update the setting for NTP_SERVER
+		   //Add by hhuiming begain for ID1007319 Fix the problem of unable to synchronize network time
+                   final Setting currentSettingforntp = globalSettings.getSettingLocked(
+                            Global.NTP_SERVER);
+                    if (currentSettingforntp.isNull()) {
+                        globalSettings.insertSettingLocked(
+                                Global.NTP_SERVER,
+                                getContext().getResources().getString(
+                                        R.string.def_ntp_server),
+                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
+                    //Add by hhuiming end
                     currentVersion = 170;
                 }
 
-- 
2.7.4