summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-11 05:52:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-11 05:52:00 +0000
commit74126d03552e824f96f15745d8214c34d8dbcb1a (patch)
tree739d8470c09c70b216c534c78eabe2f54fa71248 /src
parent4363d68739aadab194fb8e789238aaa0ec93fb1f (diff)
parentaa561db2185e79ef3cf91932864b7007f902dadd (diff)
Make IpClient populate the DHCP server address in LinkProperties am: aa561db218
Change-Id: If38230b62834e9af5c5abe597aa0bd631abc68e0
Diffstat (limited to 'src')
-rw-r--r--src/android/net/ip/IpClient.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java
index 173f136..163005a 100644
--- a/src/android/net/ip/IpClient.java
+++ b/src/android/net/ip/IpClient.java
@@ -1195,6 +1195,10 @@ public class IpClient extends StateMachine {
newLp.setMtu(mDhcpResults.mtu);
}
+ if (mDhcpResults.serverAddress != null) {
+ mShim.setDhcpServerAddress(newLp, mDhcpResults.serverAddress);
+ }
+
final String capportUrl = mDhcpResults.captivePortalApiUrl;
// Uri.parse does no syntax check; do a simple regex check to eliminate garbage.
// If the URL is still incorrect data fetching will fail later, which is fine.
@@ -1272,6 +1276,7 @@ public class IpClient extends StateMachine {
if (DBG) {
Log.d(mTag, "onNewDhcpResults(" + Objects.toString(dhcpResults) + ")");
+ Log.d(mTag, "handleIPv4Success newLp{" + newLp + "}");
}
mCallback.onNewDhcpResults(dhcpResults);
maybeSaveNetworkToIpMemoryStore();