commit 94e328c22f1b79eac05946f04bf619f5f10baaa1
author Erik Kline <ek@google.com> Wed Dec 14 03:22:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 14 03:22:12 2016 +0000
tree 4cae1b77ae744cd75e819684ebede474978e6a83
parent e57b37e423ef7ff7f7a41019dc773c9a0277b4a5
parent eef38717b9db3821024277a8c996535cac80042f

Merge "DHCPv4 anonymity profile: support skipping hostname option"
am: eef38717b9

Change-Id: Id0eff1bdb60f1895fa6dd6c619071994efd79939

services/net/java/android/net/dhcp/DhcpPacket.java

diff --git a/services/net/java/android/net/dhcp/DhcpPacket.java b/services/net/java/android/net/dhcp/DhcpPacket.java
index ef4bc02..96c8e9f 100644
--- a/services/net/java/android/net/dhcp/DhcpPacket.java
+++ b/services/net/java/android/net/dhcp/DhcpPacket.java
@@ -7,6 +7,7 @@
 import android.os.Build;
 import android.os.SystemProperties;
 import android.system.OsConstants;
+import android.text.TextUtils;
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.UnsupportedEncodingException;
@@ -629,7 +630,8 @@
     protected void addCommonClientTlvs(ByteBuffer buf) {
         addTlv(buf, DHCP_MAX_MESSAGE_SIZE, (short) MAX_LENGTH);
         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);
     }
 
     /**