diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-01-26 07:19:57 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-01-26 07:19:57 +0300 |
| commit | f9baebac50b1a48967e95214876155f7778f5d1e (patch) | |
| tree | 20296dcc4765e54dc8feae2464f7c88514d85497 | |
| parent | 13bf4fec77e6815cc4f394e4251cda99d19e467e (diff) | |
| parent | 0bac9f400229207ee16d39f4240a2cc6bbdc79df (diff) | |
| download | frameworks_base-f9baebac50b1a48967e95214876155f7778f5d1e.zip frameworks_base-f9baebac50b1a48967e95214876155f7778f5d1e.tar.gz frameworks_base-f9baebac50b1a48967e95214876155f7778f5d1e.tar.bz2 | |
Merge "set dns correctly for p2p case" into ics
| -rw-r--r-- | core/java/android/net/DhcpInfoInternal.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/net/DhcpInfoInternal.java b/core/java/android/net/DhcpInfoInternal.java index fa77bc5..946c36d 100644 --- a/core/java/android/net/DhcpInfoInternal.java +++ b/core/java/android/net/DhcpInfoInternal.java @@ -106,7 +106,8 @@ public class DhcpInfoInternal { if (TextUtils.isEmpty(dns1) == false) { p.addDns(NetworkUtils.numericToInetAddress(dns1)); } else { - Log.d(TAG, "makeLinkProperties with empty dns1!"); + p.addDns(NetworkUtils.numericToInetAddress(serverAddress)); + Log.d(TAG, "empty dns1, use dhcp server as dns1!"); } if (TextUtils.isEmpty(dns2) == false) { p.addDns(NetworkUtils.numericToInetAddress(dns2)); |