Merge "Add DHCP Rapid Commit option(RFC4039) support in client side."

am: d53f549885

Change-Id: I4a868d673f6263a5ad2d5acb475e99aac80b750c

1 files changed, 9 insertions, 1 deletions

diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java
index ea19c7b..799184e 100644
--- a/src/android/net/ip/IpClient.java
+++ b/src/android/net/ip/IpClient.java
@@ -401,6 +401,14 @@ public class IpClient extends StateMachine {
                 NetworkStackServiceManager nssManager) {
             return new NetworkStackIpMemoryStore(context, nssManager.getIpMemoryStoreService());
         }
+
+        /**
+         * Get a DhcpClient Dependencies instance.
+         */
+        public DhcpClient.Dependencies getDhcpClientDependencies(
+                NetworkStackIpMemoryStore ipMemoryStore) {
+            return new DhcpClient.Dependencies(ipMemoryStore);
+        }
     }
 
     public IpClient(Context context, String ifName, IIpClientCallbacks callback,
@@ -1190,7 +1198,7 @@ public class IpClient extends StateMachine {
         } else {
             // Start DHCPv4.
             mDhcpClient = DhcpClient.makeDhcpClient(mContext, IpClient.this, mInterfaceParams,
-                    mIpMemoryStore);
+                    mDependencies.getDhcpClientDependencies(mIpMemoryStore));
             mDhcpClient.registerForPreDhcpNotification();
             mDhcpClient.sendMessage(DhcpClient.CMD_START_DHCP, mL2Key);
         }