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

Commit f9baebac authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "set dns correctly for p2p case" into ics

parents 13bf4fec 0bac9f40

core/java/android/net/DhcpInfoInternal.java

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ public class DhcpInfoInternal { 
        if (TextUtils.isEmpty(dns1) == false) {

            p.addDns(NetworkUtils.numericToInetAddress(dns1));

        } else {

            Log.d(TAG, "makeLinkProperties with empty dns1!");

            p.addDns(NetworkUtils.numericToInetAddress(serverAddress));

            Log.d(TAG, "empty dns1, use dhcp server as dns1!");

        }

        if (TextUtils.isEmpty(dns2) == false) {

            p.addDns(NetworkUtils.numericToInetAddress(dns2));