diff options
| author | Neil Fuller <nfuller@google.com> | 2021-10-20 09:53:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-20 09:53:16 +0000 |
| commit | 953a3b3276e68afbabdb993b59491509362f6bc8 (patch) | |
| tree | f66e139165cc47c5136eddba2cbc0ea8d2b2b36e /core/java/android | |
| parent | 32060ccf62f698d80d5eac6b7e572106690904b9 (diff) | |
| parent | 8f15a06f5a8e4202c5bd41b3e5a838b3e6ada2b9 (diff) | |
Merge "Fix error prone warnings" am: 8f15a06f5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863056
Change-Id: I40565a18decf956a3439d54282555f82d615a363
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/sntp/Duration64.java | 2 | ||||
| -rw-r--r-- | core/java/android/net/sntp/Timestamp64.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/net/sntp/Duration64.java b/core/java/android/net/sntp/Duration64.java index 939b2892a18f..7f29cdb989d8 100644 --- a/core/java/android/net/sntp/Duration64.java +++ b/core/java/android/net/sntp/Duration64.java @@ -26,7 +26,7 @@ import java.time.Duration; * * @hide */ -public class Duration64 { +public final class Duration64 { public static final Duration64 ZERO = new Duration64(0); private final long mBits; diff --git a/core/java/android/net/sntp/Timestamp64.java b/core/java/android/net/sntp/Timestamp64.java index 81a33108ed85..8ddfd77ea7dc 100644 --- a/core/java/android/net/sntp/Timestamp64.java +++ b/core/java/android/net/sntp/Timestamp64.java @@ -15,6 +15,8 @@ */ package android.net.sntp; +import android.text.TextUtils; + import com.android.internal.annotations.VisibleForTesting; import java.time.Instant; @@ -113,7 +115,7 @@ public final class Timestamp64 { @Override public String toString() { - return String.format("%08x.%08x", mEraSeconds, mFractionBits); + return TextUtils.formatSimple("%08x.%08x", mEraSeconds, mFractionBits); } /** Returns the instant represented by this value in the specified NTP era. */ |