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

Commit 801646e0 authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

Merge "Extend timeout for requesting tethered interface" into rvc-dev am: ecc44483 am: c0718c3b 

Change-Id: Ib2b86dd5c53fa2f9bb6e2aadf2a1b43ea26cf885
parents b09e2b8d c0718c3b

packages/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java

+5 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ import java.util.concurrent.TimeoutException; 
public class EthernetTetheringTest {



    private static final String TAG = EthernetTetheringTest.class.getSimpleName();

    private static final int TIMEOUT_MS = 1000;

    private static final int TIMEOUT_MS = 5000;

    private static final int PACKET_READ_TIMEOUT_MS = 100;

    private static final int DHCP_DISCOVER_ATTEMPTS = 10;

    private static final byte[] DHCP_REQUESTED_PARAMS = new byte[] {
@@ -338,7 +338,8 @@ public class EthernetTetheringTest { 


    private MyTetheringEventCallback enableEthernetTethering(String iface) throws Exception {

        return enableEthernetTethering(iface,

                new TetheringRequest.Builder(TETHERING_ETHERNET).build());

                new TetheringRequest.Builder(TETHERING_ETHERNET)

                .setExemptFromEntitlementCheck(true).build());

    }



    private int getMTU(TestNetworkInterface iface) throws SocketException {
@@ -508,7 +509,8 @@ public class EthernetTetheringTest { 
        LinkAddress localAddr = local == null ? null : new LinkAddress(local);

        LinkAddress clientAddr = client == null ? null : new LinkAddress(client);

        return new TetheringRequest.Builder(TETHERING_ETHERNET)

                .setStaticIpv4Addresses(localAddr, clientAddr).build();

                .setStaticIpv4Addresses(localAddr, clientAddr)

                .setExemptFromEntitlementCheck(true).build();

    }



    private void assertInvalidStaticIpv4Request(String iface, String local, String client)