diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-01-08 01:03:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-08 01:03:49 +0000 |
| commit | bcba21827c836e8941719b432fbf11d1bb8e8639 (patch) | |
| tree | dde2fcfa5a96fd5b482016e821a721f428288d46 /core/java/android/util | |
| parent | 5df729ad09b85cb68bdf37d58c5d429c2c8663a4 (diff) | |
| parent | 387da7769757ab6368acb2a0000cd8a85d3e55d8 (diff) | |
| download | frameworks_base-bcba21827c836e8941719b432fbf11d1bb8e8639.zip frameworks_base-bcba21827c836e8941719b432fbf11d1bb8e8639.tar.gz frameworks_base-bcba21827c836e8941719b432fbf11d1bb8e8639.tar.bz2 | |
Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1
automerge: 387da77
* commit '387da7769757ab6368acb2a0000cd8a85d3e55d8':
check ntpserver as empty string instead of null
Diffstat (limited to 'core/java/android/util')
| -rw-r--r-- | core/java/android/util/NtpTrustedTime.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/util/NtpTrustedTime.java b/core/java/android/util/NtpTrustedTime.java index 602a68c..b18cc3b 100644 --- a/core/java/android/util/NtpTrustedTime.java +++ b/core/java/android/util/NtpTrustedTime.java @@ -22,6 +22,7 @@ import android.content.res.Resources; import android.net.SntpClient; import android.os.SystemClock; import android.provider.Settings; +import android.text.TextUtils; /** * {@link TrustedTime} that connects with a remote NTP server as its trusted @@ -73,7 +74,7 @@ public class NtpTrustedTime implements TrustedTime { @Override public boolean forceRefresh() { - if (mServer == null) { + if (TextUtils.isEmpty(mServer)) { // missing server, so no trusted time available return false; } |