Merge "Extend timeout for requesting tethered interface" am: 3a7c2abe am:...

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[] {

    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 {

        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)