summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Couillaud <pierre@broadcom.com>2015-02-16 07:58:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-16 07:58:48 +0000
commit52334a190a36d6fdbfcf0a38526925183f396fb2 (patch)
treecf0dae124eb25c5de4ecf8e54060dfdd07c7f1b7
parenta3d7e61812f8d68ca109280c4e7589e4f968723a (diff)
parentef8e0b9491467cf8d49fa3af7d43f12e3bd524e4 (diff)
downloadandroid_frameworks_opt_net_ethernet-52334a190a36d6fdbfcf0a38526925183f396fb2.tar.gz
android_frameworks_opt_net_ethernet-52334a190a36d6fdbfcf0a38526925183f396fb2.tar.bz2
android_frameworks_opt_net_ethernet-52334a190a36d6fdbfcf0a38526925183f396fb2.zip
am ef8e0b94: eth: make sure dhcp is stopped before bringing up interface.
* commit 'ef8e0b9491467cf8d49fa3af7d43f12e3bd524e4': eth: make sure dhcp is stopped before bringing up interface.
-rw-r--r--java/com/android/server/ethernet/EthernetNetworkFactory.java1
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);