diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-01-08 00:57:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-08 00:57:43 +0000 |
| commit | dbcb4a16d4c91d960359fbdb8c6f1d72a4daca9e (patch) | |
| tree | 977596ae8b56fe185a6087ee6239b81920bd0cc3 /core/java/android/util | |
| parent | 022b1ba188b249b0f17d1b5e8ab3badbc529f98e (diff) | |
| parent | 0eda7dfcacd838da4a534230f62a121b826000d6 (diff) | |
Merge "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 602a68c81a69..b18cc3bbabee 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; } |