Android系统关于ntp的修改（网络时间同步） - ToB企服应用市场:ToB评测及商务社交产业平台

diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 129cee58078..8ffc237c7e1 100755
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -229,4 +229,6 @@
<integer name="def_screenshot_button_show">1</integer>
<string name="def_screenshot_location">internal_storage</string>
+
+ <string name="def_ntp_server" translatable="false">time.windows.com</string>
</resources>

复制代码

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 0ba3a5289ed..29361ad19bc 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2733,6 +2733,9 @@ class DatabaseHelper extends SQLiteOpenHelper {
loadSetting(stmt, Settings.Global.ENHANCED_4G_MODE_ENABLED,
ImsConfig.FeatureValueConstants.ON);
+ loadStringSetting(stmt, Settings.Global.NTP_SERVER,
+ R.string.def_ntp_server);
+
/*
* IMPORTANT: Do not add any more upgrade steps here as the global,
* secure, and system settings are no longer stored in a database

复制代码

<string translatable="false" name="config_ntpServer">2.android.pool.ntp.org</string>
<integer name="config_ntpPollingInterval">86400000</integer>
<integer name="config_ntpPollingIntervalShorter">30000</integer>
<!-- Number of times to try again with the shorter interval, before backing
off until the normal polling interval. A value < 0 indicates infinite. -->
<integer name="config_ntpRetry">5</integer>
<integer name="config_ntpTimeout">10</integer>

复制代码

<string translatable="false" name="config_ntpServer">ntp1.aliyun.com</string>

复制代码

diff --git a/core/java/android/util/NtpTrustedTime.java b/core/java/android/util/NtpTrustedTime.java
index ed2d3c60fcd..60ad5d9f132 100644
--- a/core/java/android/util/NtpTrustedTime.java
+++ b/core/java/android/util/NtpTrustedTime.java
@@ -39,7 +39,7 @@ public class NtpTrustedTime implements TrustedTime {
private static NtpTrustedTime sSingleton;
private static Context sContext;
- private final String mServer;
+ private String mServer;
private final long mTimeout;
private ConnectivityManager mCM;
@@ -49,6 +49,15 @@ public class NtpTrustedTime implements TrustedTime {
private long mCachedNtpElapsedRealtime;
private long mCachedNtpCertainty;
+ String[] backupNtpServers = new String[]{
+ "tw.pool.ntp.org",
+ "time.nist.gov",
+ "time-a.nist.gov",
+ "ntp1.aliyun.com"
+ };
+ int index = -1;
+
+
private NtpTrustedTime(String server, long timeout) {
if (LOGD) Log.d(TAG, "creating NtpTrustedTime using " + server);
mServer = server;
@@ -101,15 +110,29 @@ public class NtpTrustedTime implements TrustedTime {
if (LOGD) Log.d(TAG, "forceRefresh() from cache miss");
final SntpClient client = new SntpClient();
- if (client.requestTime(mServer, (int) mTimeout)) {
- mHasCache = true;
- mCachedNtpTime = client.getNtpTime();
- mCachedNtpElapsedRealtime = client.getNtpTimeReference();
- mCachedNtpCertainty = client.getRoundTripTime() / 2;
- return true;
- } else {
- return false;
+
+ boolean result = false;
+ while(!(result = client.requestTime(mServer, (int)mTimeout)) && index < (backupNtpServers.length-1)){
+ index++;
+ mServer = backupNtpServers[index];
}
+ index = -1;
+ Resources res = sContext.getResources();
+ String defaultServer = res.getString(
+ com.android.internal.R.string.config_ntpServer);
+ String secureServer = Settings.Global.getString(
+ sContext.getContentResolver(), Settings.Global.NTP_SERVER);
+
+ mServer = secureServer != null ? secureServer : defaultServer;
+
+ if(result){
+ mHasCache = true;
+ mCachedNtpTime = client.getNtpTime();
+ mCachedNtpElapsedRealtime = client.getNtpTimeReference();
+ mCachedNtpCertainty = client.getRoundTripTime() / 2;
+ }
+
+ return result;
}
@Override

复制代码

diff --git a/frameworks/base/core/java/android/util/NtpTrustedTime.java b/frameworks/base/core/java/android/util/NtpTrustedTime.java
old mode 100644
new mode 100755
index 0892c94d5b..bb8f894cb3
--- a/frameworks/base/core/java/android/util/NtpTrustedTime.java
+++ b/frameworks/base/core/java/android/util/NtpTrustedTime.java
@@ -98,6 +98,27 @@ public class NtpTrustedTime implements TrustedTime {
private static NtpTrustedTime sSingleton;
+ String[] backupNtpServers = new String[]{
+ "time.nist.gov",
+ "time-a.nist.gov",
+ "ntp1.aliyun.com",
+ "ntp2.aliyun.com",
+ "ntp3.aliyun.com",
+ "ntp-sz.chl.la",
+ "3.cn.pool.ntp.org",
+ "asia.pool.ntp.org",
+ "cn.pool.ntp.org",
+ "sg.pool.ntp.org",
+ "jp.pool.ntp.org",
+ "hk.pool.ntp.org",
+ "s2g.time.edu.cn",
+ "oceania.pool.ntp.org",
+ "south-america.pool.ntp.org",
+ "north-america.pool.ntp.org",
+ "tw.pool.ntp.org",
+ };
+ int index = -1;
+
@NonNull
private final Context mContext;
@@ -162,12 +183,18 @@ public class NtpTrustedTime implements TrustedTime {
if (LOGD) Log.d(TAG, "forceRefresh() from cache miss");
final SntpClient client = new SntpClient();
- final String serverName = connectionInfo.getServer();
+ boolean result = false;
+ String serverName = connectionInfo.getServer();
+ if (LOGD) Log.d(TAG, "----------rockemd-add-20221027-serverName--1------"+serverName);
final int timeoutMillis = connectionInfo.getTimeoutMillis();
- if (client.requestTime(serverName, timeoutMillis, network)) {
+ while (!(result = client.requestTime(serverName, timeoutMillis, network)) && index < (backupNtpServers.length-1) ) {
+ index++;
+ serverName = backupNtpServers[index];
+ if (LOGD) Log.d(TAG, "----------rockemd-add-20221027-serverName--------"+serverName);
+ }
+ if(result){
long ntpCertainty = client.getRoundTripTime() / 2;
- mTimeResult = new TimeResult(
- client.getNtpTime(), client.getNtpTimeReference(), ntpCertainty);
+ mTimeResult = new TimeResult(client.getNtpTime(), client.getNtpTimeReference(), ntpCertainty);
return true;
} else {
return false;

复制代码

adb shell settings put global ntp_server ntp.ntsc.ac.cn //更改服务器地址
adb shell setprop persist.sys.timezone Asia/Shangha //更改时区
adb shell settings get global ntp_server //查看当前使用地址
adb shel1 settings put global auto_time 1 //打开网络同步时间开关
adb shel1 settings put global auto_time 0 //关闭网络同步时间开关

复制代码