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

Commit 11a4120b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6091606 from 2ab8c76a to rvc-release 

Change-Id: I1b6ab57842bd8067bdef6db80b8d948638083cf6
parents c46bbad8 2ab8c76a

src/android/net/dhcp/DhcpClient.java

+3 −14
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ public class DhcpClient extends StateMachine { 
    private static final int PRIVATE_BASE         = IpClient.DHCPCLIENT_CMD_BASE + 100;

    private static final int CMD_KICK             = PRIVATE_BASE + 1;

    private static final int CMD_RECEIVED_PACKET  = PRIVATE_BASE + 2;

    private static final int CMD_TIMEOUT          = PRIVATE_BASE + 3;

    @VisibleForTesting

    public static final int CMD_TIMEOUT           = PRIVATE_BASE + 3;

    private static final int CMD_RENEW_DHCP       = PRIVATE_BASE + 4;

    private static final int CMD_REBIND_DHCP      = PRIVATE_BASE + 5;

    private static final int CMD_EXPIRE_DHCP      = PRIVATE_BASE + 6;
@@ -888,11 +889,8 @@ public class DhcpClient extends StateMachine { 
                    mConfiguration = (Configuration) message.obj;

                    if (mConfiguration.isPreconnectionEnabled) {

                        transitionTo(mDhcpPreconnectingState);

                    } else if (isDhcpLeaseCacheEnabled()) {

                        preDhcpTransitionTo(mWaitBeforeObtainingConfigurationState,

                                mObtainingConfigurationState);

                    } else {

                        preDhcpTransitionTo(mWaitBeforeStartState, mDhcpInitState);

                        startInitRebootOrInit();

                    }

                    return HANDLED;

                default:
@@ -1267,15 +1265,6 @@ public class DhcpClient extends StateMachine { 
            l2Packet.payload = packet.array();

            mController.sendMessage(CMD_START_PRECONNECTION, l2Packet);

        }



        private void startInitRebootOrInit() {

            if (isDhcpLeaseCacheEnabled()) {

                preDhcpTransitionTo(mWaitBeforeObtainingConfigurationState,

                        mObtainingConfigurationState);

            } else {

                preDhcpTransitionTo(mWaitBeforeStartState, mDhcpInitState);

            }

        }

    }



    // Not implemented. We request the first offer we receive.

src/android/net/ip/IpClient.java

+10 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.net.TcpKeepalivePacketDataParcelable; 
import android.net.apf.ApfCapabilities;

import android.net.apf.ApfFilter;

import android.net.dhcp.DhcpClient;

import android.net.dhcp.DhcpClient.Configuration;

import android.net.metrics.IpConnectivityLog;

import android.net.metrics.IpManagerEvent;

import android.net.shared.InitialConfiguration;
@@ -477,6 +476,14 @@ public class IpClient extends StateMachine { 
            return new NetworkStackIpMemoryStore(context, nssManager.getIpMemoryStoreService());

        }



        /**

         * Get a DhcpClient instance.

         */

        public DhcpClient makeDhcpClient(Context context, StateMachine controller,

                InterfaceParams ifParams, DhcpClient.Dependencies deps) {

            return DhcpClient.makeDhcpClient(context, controller, ifParams, deps);

        }



        /**

         * Get a DhcpClient Dependencies instance.

         */
@@ -1518,7 +1525,7 @@ public class IpClient extends StateMachine { 


    private void startDhcpClient() {

        // Start DHCPv4.

        mDhcpClient = DhcpClient.makeDhcpClient(mContext, IpClient.this, mInterfaceParams,

        mDhcpClient = mDependencies.makeDhcpClient(mContext, IpClient.this, mInterfaceParams,

                mDependencies.getDhcpClientDependencies(mIpMemoryStore));



        // If preconnection is enabled, there is no need to ask Wi-Fi to disable powersaving
@@ -1527,7 +1534,7 @@ public class IpClient extends StateMachine { 
        // registerForPreDhcpNotification is called later when processing the CMD_*_PRECONNECTION

        // messages.

        if (!isUsingPreconnection()) mDhcpClient.registerForPreDhcpNotification();

        mDhcpClient.sendMessage(DhcpClient.CMD_START_DHCP, new Configuration(mL2Key,

        mDhcpClient.sendMessage(DhcpClient.CMD_START_DHCP, new DhcpClient.Configuration(mL2Key,

                isUsingPreconnection()));

    }

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

+160 −48

File changed.

Preview size limit exceeded, changes collapsed.

tests/unit/src/android/net/ip/IpClientTest.java

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ public class IpClientTest { 
        doDefaultDualStackProvisioningConfigurationTest(false /* avoidBadWifi */);

    }



    @Test

    public void testProvisioningWithInitialConfiguration() throws Exception {

        final String iface = TEST_IFNAME;

        final IpClient ipc = makeIpClient(iface);

tests/unit/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import libcore.io.Streams; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -769,6 +770,8 @@ public class IpMemoryStoreServiceTest { 
                        })));

    }



    @Test

    @Ignore

    public void testTasksAreSerial() {

        final long sleepTimeMs = 1000;

        final long startTime = System.currentTimeMillis();