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

Commit 628ae8fc authored by Lorenzo Colitti's avatar Lorenzo Colitti 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." into rvc-dev am: fdbc41a2 am: cb04ddcf

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

Change-Id: I484c9996a4c683db193fba7785f2e62e5192ae64
parents fecc0bfb cb04ddcf

src/android/net/ip/IpClient.java

+1 −1
Original line number Diff line number Diff line
@@ -1772,7 +1772,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
@@ -1658,8 +1658,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 */,
@@ -1684,6 +1683,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()
@@ -1702,6 +1706,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 */,