Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4539fb18 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

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

Merge "DHCPv4 anonymity profile: support skipping hostname option" am: eef38717 am: 94e328c2 am: 68700dc7
am: 6ba22b5d

Change-Id: I3b3cade76fa364899f7e177483b42020238bf691
parents 76c9a0d2 6ba22b5d

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

+3 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import android.net.metrics.DhcpErrorEvent; 
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 @@ abstract class DhcpPacket { 
    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);

    }



    /**