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

Commit dea7161f authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: 2d7f36ca

Change-Id: I260cb22b31cd10cac603b3fef7bc2d64440b3a6f
parents 2209c2a1 2d7f36ca

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

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




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

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

        return new NetworkAttributes.Builder()

        return new NetworkAttributes.Builder()

                .setGroupHint(hint)

                .setCluster(hint)

                .setMtu(mtu)

                .setMtu(mtu)

                .build();

                .build();

    }

    }

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

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




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

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

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

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

        builder.setGroupHint("groupHint");

        builder.setCluster("groupHint");

        builder.setDnsAddresses(Arrays.asList(

        builder.setDnsAddresses(Arrays.asList(

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

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

                InetAddress.getByName("6.7.8.9")));

                InetAddress.getByName("6.7.8.9")));