diff options
| author | Pierre Couillaud <pierre@broadcom.com> | 2015-02-16 08:08:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-16 08:08:06 +0000 |
| commit | f0653246d3bbf0d535d7f8ad4b59833150b129b4 (patch) | |
| tree | cf0dae124eb25c5de4ecf8e54060dfdd07c7f1b7 | |
| parent | e054cab9bdf485f919e8642f3be38d7dcdc73bd3 (diff) | |
| parent | 52334a190a36d6fdbfcf0a38526925183f396fb2 (diff) | |
| download | android_frameworks_opt_net_ethernet-f0653246d3bbf0d535d7f8ad4b59833150b129b4.tar.gz android_frameworks_opt_net_ethernet-f0653246d3bbf0d535d7f8ad4b59833150b129b4.tar.bz2 android_frameworks_opt_net_ethernet-f0653246d3bbf0d535d7f8ad4b59833150b129b4.zip | |
am 52334a19: am ef8e0b94: eth: make sure dhcp is stopped before bringing up interface.
* commit '52334a190a36d6fdbfcf0a38526925183f396fb2':
eth: make sure dhcp is stopped before bringing up interface.
| -rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index bbb99d8..0c4f57d 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java @@ -166,6 +166,7 @@ class EthernetNetworkFactory { private void setInterfaceUp(String iface) { // Bring up the interface so we get link status indications. try { + NetworkUtils.stopDhcp(iface); mNMService.setInterfaceUp(iface); String hwAddr = null; InterfaceConfiguration config = mNMService.getInterfaceConfig(iface); |