commit d08728aa5050ca03b6954ddb708146e16c1fb53a
author Bill Yi <byi@google.com> Thu Feb 19 14:31:46 2015 -0800
committer Bill Yi <byi@google.com> Thu Feb 19 14:31:46 2015 -0800
tree cf0dae124eb25c5de4ecf8e54060dfdd07c7f1b7
parent ef8e0b9491467cf8d49fa3af7d43f12e3bd524e4
parent a3d7e61812f8d68ca109280c4e7589e4f968723a

Merge commit 'a3d7e61812f8d68ca109280c4e7589e4f968723a' into HEAD

java/com/android/server/ethernet/EthernetNetworkFactory.java

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 @@
     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);