summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2012-01-17 15:18:20 +0000
committerGerrit Code Review <gerrit@betelgeuse.canonical.com>2012-01-17 15:18:20 +0000
commit0eb202bdd60cafbc36692027f2ead5c7857210b3 (patch)
treea151f502ad673749a5b32012ccfa74e04bd52853
parent6b27f9dc3adfe8657f5c5510e64858813342515a (diff)
parent881dff481e23f286a13284b473b72759d8f14af0 (diff)
downloadbase-0eb202bdd60cafbc36692027f2ead5c7857210b3.tar.gz
Merge "For Bug #915434. vexpress: ECM does not set DNS address" into linaro_android_4.0.3
-rw-r--r--ethernet/java/android/net/ethernet/EthernetStateMachine.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/ethernet/java/android/net/ethernet/EthernetStateMachine.java b/ethernet/java/android/net/ethernet/EthernetStateMachine.java
index 2a3054057ac9..4001ad583902 100644
--- a/ethernet/java/android/net/ethernet/EthernetStateMachine.java
+++ b/ethernet/java/android/net/ethernet/EthernetStateMachine.java
@@ -426,6 +426,7 @@ public class EthernetStateMachine extends StateMachine {
Slog.d(TAG, "DhcpHandler: DHCP request started");
DhcpInfoInternal dhcpInfoInternal = new DhcpInfoInternal();
if (NetworkUtils.runDhcp(mInterfaceName, dhcpInfoInternal)) {
+ SystemProperties.set("net.dns1", dhcpInfoInternal.dns1);
event = EVENT_INTERFACE_CONFIGURATION_SUCCEEDED;
Slog.d(TAG, "DhcpHandler: DHCP request succeeded: " + dhcpInfoInternal.toString());
} else {