diff options
4 files changed, 15 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. */ diff --git a/core/tests/coretests/src/android/net/sntp/Duration64Test.java b/core/tests/coretests/src/android/net/sntp/Duration64Test.java index 933800f5d65b..60b69f622221 100644 --- a/core/tests/coretests/src/android/net/sntp/Duration64Test.java +++ b/core/tests/coretests/src/android/net/sntp/Duration64Test.java @@ -21,13 +21,17 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; +import org.junit.runner.RunWith; import java.time.Duration; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneOffset; +@RunWith(AndroidJUnit4.class) public class Duration64Test { @Test diff --git a/core/tests/coretests/src/android/net/sntp/Timestamp64Test.java b/core/tests/coretests/src/android/net/sntp/Timestamp64Test.java index c923812fa2fb..1b1c500c127f 100644 --- a/core/tests/coretests/src/android/net/sntp/Timestamp64Test.java +++ b/core/tests/coretests/src/android/net/sntp/Timestamp64Test.java @@ -21,13 +21,17 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Test; +import org.junit.runner.RunWith; import java.time.Instant; import java.util.HashSet; import java.util.Random; import java.util.Set; +@RunWith(AndroidJUnit4.class) public class Timestamp64Test { @Test @@ -191,6 +195,7 @@ public class Timestamp64Test { } } + @SuppressWarnings("JavaInstantGetSecondsGetNano") private static void assertInstantCreationOnlyFractionExact( int fractionBits, long expectedNanos) { Timestamp64 timestamp64 = Timestamp64.fromComponents(0, fractionBits); @@ -201,6 +206,7 @@ public class Timestamp64Test { assertEquals(expectedNanos, instant.getNano()); } + @SuppressWarnings("JavaInstantGetSecondsGetNano") private static void assertNanosWithTruncationAllowed(long expectedNanos, Instant instant) { // Allow for < 1ns difference due to truncation. long actualNanos = instant.getNano(); @@ -208,6 +214,7 @@ public class Timestamp64Test { actualNanos == expectedNanos || actualNanos == expectedNanos - 1); } + @SuppressWarnings("JavaInstantGetSecondsGetNano") @Test public void testMillisRandomizationConstant() { // Mathematically, we can say that to represent 1000 different values, we need 10 binary |