Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DHCPv4 anonymity profile: support skipping hostname option"

Browse Source
This commit is contained in:
Treehugger Robot
2016-12-14 03:07:48 +00:00
committed by Gerrit Code Review
parent 70b262b0f2 511818ffb3
commit eef38717b9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/net/java/android/net/dhcp/DhcpPacket.java
View File

@@ -7,6 +7,7 @@ import android.net.metrics.DhcpErrorEvent;
import android.os.Build; import android.os.Build;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.system.OsConstants; import android.system.OsConstants;
import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@@ -629,7 +630,8 @@ abstract class DhcpPacket {
protected void addCommonClientTlvs(ByteBuffer buf) { protected void addCommonClientTlvs(ByteBuffer buf) {
addTlv(buf, DHCP_MAX_MESSAGE_SIZE, (short) MAX_LENGTH); addTlv(buf, DHCP_MAX_MESSAGE_SIZE, (short) MAX_LENGTH);
addTlv(buf, DHCP_VENDOR_CLASS_ID, getVendorId()); addTlv(buf, DHCP_VENDOR_CLASS_ID, getVendorId());
addTlv(buf, DHCP_HOST_NAME, getHostname()); final String hn = getHostname();
if (!TextUtils.isEmpty(hn)) addTlv(buf, DHCP_HOST_NAME, hn);
} }
/** /**