Disable the IpManager timeout on Ethernet.
am: c84dd94998
* commit 'c84dd9499807fcf281e846e46d451e677d8cbef2':
Disable the IpManager timeout on Ethernet.
Change-Id: I33e0c1243534db348a0b6a8f8ce1a71b68d0ff91
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java
index 7186863..0b091f2 100644
--- a/java/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -33,6 +33,7 @@
import android.net.NetworkInfo.DetailedState;
import android.net.StaticIpConfiguration;
import android.net.ip.IpManager;
+import android.net.ip.IpManager.ProvisioningConfiguration;
import android.net.ip.IpManager.WaitForProvisioningCallback;
import android.os.Handler;
import android.os.IBinder;
@@ -283,7 +284,6 @@
}
}
- // TODO: Handle DHCP renew.
final Thread ipProvisioningThread = new Thread(new Runnable() {
public void run() {
if (DBG) {
@@ -308,6 +308,7 @@
public void onLinkPropertiesChange(LinkProperties newLp) {
synchronized(EthernetNetworkFactory.this) {
if (mNetworkAgent != null && mNetworkInfo.isConnected()) {
+ mLinkProperties = newLp;
mNetworkAgent.sendLinkProperties(newLp);
}
}
@@ -329,7 +330,11 @@
mIpManager.setTcpBufferSizes(tcpBufferSizes);
}
- mIpManager.startProvisioning();
+ final ProvisioningConfiguration provisioningConfiguration =
+ mIpManager.buildProvisioningConfiguration()
+ .withProvisioningTimeoutMs(0)
+ .build();
+ mIpManager.startProvisioning(provisioningConfiguration);
}
linkProperties = ipmCallback.waitForProvisioning();
@@ -526,5 +531,11 @@
pw.println("NetworkInfo: " + mNetworkInfo);
pw.println("LinkProperties: " + mLinkProperties);
pw.println("NetworkAgent: " + mNetworkAgent);
+ if (mIpManager != null) {
+ pw.println("IpManager:");
+ pw.increaseIndent();
+ mIpManager.dump(fd, pw, args);
+ pw.decreaseIndent();
+ }
}
}