Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1

Browse Source 
automerge: 387da77

* commit '387da7769757ab6368acb2a0000cd8a85d3e55d8':
  check ntpserver as empty string instead of null
This commit is contained in:
Jeff Sharkey
2015-01-08 01:03:49 +00:00
committed by android-build-merger
parent 5df729ad09 387da77697
commit bcba21827c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/util/NtpTrustedTime.java
View File

@@ -22,6 +22,7 @@ import android.content.res.Resources;
import android.net.SntpClient; import android.net.SntpClient;
import android.os.SystemClock; import android.os.SystemClock;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils;
/** /**
* {@link TrustedTime} that connects with a remote NTP server as its trusted * {@link TrustedTime} that connects with a remote NTP server as its trusted
@@ -73,7 +74,7 @@ public class NtpTrustedTime implements TrustedTime {
@Override @Override
public boolean forceRefresh() { public boolean forceRefresh() {
if (mServer == null) { if (TextUtils.isEmpty(mServer)) {
// missing server, so no trusted time available // missing server, so no trusted time available
return false; return false;
} }