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

Commit ac7eb77b authored by Xiao Ma's avatar Xiao Ma Committed by android-build-merger
Browse files

Merge "provide a resource overlay to configure customized DNS Server." am:... 

Merge "provide a resource overlay to configure customized DNS Server." am: 7db7b331 am: c116de19
am: 186bf7c6

Change-Id: I1d2c0926d82b5d2975d129eae34189f992dbae82
parents cfb4e06b 186bf7c6

packages/NetworkStack/res/values/config.xml

+5 −1
Original line number Diff line number Diff line
@@ -35,4 +35,8 @@ 
    </string-array>

    <string-array name="config_captive_portal_fallback_probe_specs" translatable="false">

    </string-array>



    <!-- Customized default DNS Servers address. -->

    <string-array name="config_default_dns_servers" translatable="false">

    </string-array>

</resources>

packages/NetworkStack/src/android/net/dhcp/DhcpClient.java

+14 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY; 


import android.content.Context;

import android.net.DhcpResults;

import android.net.InetAddresses;

import android.net.TrafficStats;

import android.net.ip.IpClient;

import android.net.metrics.DhcpClientEvent;
@@ -66,6 +67,7 @@ import com.android.internal.util.MessageUtils; 
import com.android.internal.util.State;

import com.android.internal.util.StateMachine;

import com.android.internal.util.WakeupMessage;

import com.android.networkstack.R;



import java.io.FileDescriptor;

import java.io.IOException;
@@ -498,6 +500,18 @@ public class DhcpClient extends StateMachine { 


    private void acceptDhcpResults(DhcpResults results, String msg) {

        mDhcpLease = results;

        if (mDhcpLease.dnsServers.isEmpty()) {

            // supplement customized dns servers

            String[] dnsServersList =

                    mContext.getResources().getStringArray(R.array.config_default_dns_servers);

            for (final String dnsServer : dnsServersList) {

                try {

                    mDhcpLease.dnsServers.add(InetAddresses.parseNumericAddress(dnsServer));

                } catch (IllegalArgumentException e) {

                    Log.e(TAG, "Invalid default DNS server: " + dnsServer, e);

                }

            }

        }

        mOffer = null;

        Log.d(TAG, msg + " lease: " + mDhcpLease);

        notifySuccess();