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

Commit b5f53d05 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Transition to appropriate state after all left addresses have been... 

Merge "Transition to appropriate state after all left addresses have been cleared." am: 220d4600 am: 3e3f300b am: 2cea7699 am: 8a2792ff am: 398dff4a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1335524

Change-Id: I218d4d73b2d652d1e4f4a8d85df324dda69e72a7
parents ff06725c 398dff4a

src/android/net/ip/IpClient.java

+1 −1
Original line number Diff line number Diff line
@@ -1793,7 +1793,7 @@ public class IpClient extends StateMachine { 
                case EVENT_NETLINK_LINKPROPERTIES_CHANGED:

                    handleLinkPropertiesUpdate(NO_CALLBACKS);

                    if (readyToProceed()) {

                        transitionTo(mRunningState);

                        transitionTo(isUsingPreconnection() ? mPreconnectingState : mRunningState);

                    }

                    break;

tests/integration/src/android/net/ip/IpClientIntegrationTest.java

+22 −2
Original line number Diff line number Diff line
@@ -1659,8 +1659,7 @@ public class IpClientIntegrationTest { 
        HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

    }



    @Test

    public void testIpClientClearingIpAddressState() throws Exception {

    private void doIPv4OnlyProvisioningAndExitWithLeftAddress() throws Exception {

        final long currentTime = System.currentTimeMillis();

        performDhcpHandshake(true /* isSuccessLease */, TEST_LEASE_DURATION_S,

                true /* isDhcpLeaseCacheEnabled */, false /* shouldReplyRapidCommitAck */,
@@ -1685,6 +1684,11 @@ public class IpClientIntegrationTest { 
        // TODO: once IpClient gets IP addresses directly from netlink instead of from netd, it

        // may be sufficient to call waitForIdle to see if IpClient has seen the address.

        addIpAddressAndWaitForIt(mIfaceName);

    }



    @Test

    public void testIpClientClearingIpAddressState() throws Exception {

        doIPv4OnlyProvisioningAndExitWithLeftAddress();



        ProvisioningConfiguration config = new ProvisioningConfiguration.Builder()

                .withoutIpReachabilityMonitor()
@@ -1703,6 +1707,22 @@ public class IpClientIntegrationTest { 
        assertEquals("0.0.0.0", cfg.ipv4Addr);

    }



    @Test

    public void testIpClientClearingIpAddressState_enablePreconnection() throws Exception {

        doIPv4OnlyProvisioningAndExitWithLeftAddress();



        // Enter ClearingIpAddressesState to clear the remaining IPv4 addresses and transition to

        // PreconnectionState instead of RunningState.

        startIpClientProvisioning(false /* isDhcpLeaseCacheEnabled */,

                false /* shouldReplyRapidCommitAck */, true /* isDhcpPreConnectionEnabled */,

                false /* isDhcpIpConflictDetectEnabled */);

        assertDiscoverPacketOnPreconnectionStart();



        // Force to enter RunningState.

        mIpc.notifyPreconnectionComplete(false /* abort */);

        HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

    }



    @Test

    public void testDhcpClientPreconnection_success() throws Exception {

        doIpClientProvisioningWithPreconnectionTest(true /* shouldReplyRapidCommitAck */,