LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable the IpManager timeout on Ethernet. am: 0587321554

Browse Source 
am: 8bb0952a05

* commit '8bb0952a059c20a47ea0747346f8afb896a6ab9d':
  Disable the IpManager timeout on Ethernet.

Change-Id: I698a59f0b897422b88c4f09f8116a6eab3c14701
This commit is contained in:
Lorenzo Colitti
2016-04-29 13:39:06 +00:00
committed by android-build-merger
parent 5774ef5328 8bb0952a05
commit 9b49b7f8b2
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -33,6 +33,7 @@ import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import android.net.StaticIpConfiguration; import android.net.StaticIpConfiguration;
import android.net.ip.IpManager; import android.net.ip.IpManager;
import android.net.ip.IpManager.ProvisioningConfiguration;
import android.net.ip.IpManager.WaitForProvisioningCallback; import android.net.ip.IpManager.WaitForProvisioningCallback;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
@@ -283,7 +284,6 @@ class EthernetNetworkFactory {
} }
} }
// TODO: Handle DHCP renew.
final Thread ipProvisioningThread = new Thread(new Runnable() { final Thread ipProvisioningThread = new Thread(new Runnable() {
public void run() { public void run() {
if (DBG) { if (DBG) {
@@ -308,6 +308,7 @@ class EthernetNetworkFactory {
public void onLinkPropertiesChange(LinkProperties newLp) { public void onLinkPropertiesChange(LinkProperties newLp) {
synchronized(EthernetNetworkFactory.this) { synchronized(EthernetNetworkFactory.this) {
if (mNetworkAgent != null && mNetworkInfo.isConnected()) { if (mNetworkAgent != null && mNetworkInfo.isConnected()) {
mLinkProperties = newLp;
mNetworkAgent.sendLinkProperties(newLp); mNetworkAgent.sendLinkProperties(newLp);
} }
} }
@@ -329,7 +330,11 @@ class EthernetNetworkFactory {
mIpManager.setTcpBufferSizes(tcpBufferSizes); mIpManager.setTcpBufferSizes(tcpBufferSizes);
} }
mIpManager.startProvisioning(); final ProvisioningConfiguration provisioningConfiguration =
mIpManager.buildProvisioningConfiguration()
.withProvisioningTimeoutMs(0)
.build();
mIpManager.startProvisioning(provisioningConfiguration);
} }
linkProperties = ipmCallback.waitForProvisioning(); linkProperties = ipmCallback.waitForProvisioning();
@@ -526,5 +531,11 @@ class EthernetNetworkFactory {
pw.println("NetworkInfo: " + mNetworkInfo); pw.println("NetworkInfo: " + mNetworkInfo);
pw.println("LinkProperties: " + mLinkProperties); pw.println("LinkProperties: " + mLinkProperties);
pw.println("NetworkAgent: " + mNetworkAgent); pw.println("NetworkAgent: " + mNetworkAgent);
if (mIpManager != null) {
pw.println("IpManager:");
pw.increaseIndent();
mIpManager.dump(fd, pw, args);
pw.decreaseIndent();
}
} }
} }