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

Commit 2d7f36ca authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Adjust tests for renaming groupHint to cluster." am: 1e1a2e4e... 

Merge "Merge "Adjust tests for renaming groupHint to cluster." am: 1e1a2e4e am: aeda1782" into rvc-dev-plus-aosp
parents d888ed0e b3597bea

tests/net/java/android/net/IpMemoryStoreTest.java

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public class IpMemoryStoreTest { 


    private static NetworkAttributes buildTestNetworkAttributes(String hint, int mtu) {

        return new NetworkAttributes.Builder()

                .setGroupHint(hint)

                .setCluster(hint)

                .setMtu(mtu)

                .build();

    }

tests/net/java/android/net/ipmemorystore/ParcelableTests.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class ParcelableTests { 


        builder.setAssignedV4Address((Inet4Address) Inet4Address.getByName("6.7.8.9"));

        builder.setAssignedV4AddressExpiry(System.currentTimeMillis() + 3_600_000);

        builder.setGroupHint("groupHint");

        builder.setCluster("groupHint");

        builder.setDnsAddresses(Arrays.asList(

                InetAddress.getByName("ACA1:652B:0911:DE8F:1200:115E:913B:AA2A"),

                InetAddress.getByName("6.7.8.9")));