Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 953a3b32 authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Fix error prone warnings" am: 8f15a06f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863056

Change-Id: I40565a18decf956a3439d54282555f82d615a363
parents 32060ccf 8f15a06f

core/java/android/net/sntp/Duration64.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/net/sntp/Timestamp64.java

+3 −1
Original line number Diff line number Diff line
@@ -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. */

core/tests/coretests/src/android/net/sntp/Duration64Test.java

+4 −0
Original line number Diff line number Diff line
@@ -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

core/tests/coretests/src/android/net/sntp/Timestamp64Test.java

+7 −0
Original line number Diff line number Diff line
@@ -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