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

Commit 786deba6 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" 

automerge: fba459d3

* commit 'fba459d3':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
parents e7a69cbf fba459d3

core/java/android/net/DhcpResults.java

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ public class DhcpResults extends StaticIpConfiguration { 
        vendorInfo = info;

    }



    public void setDomains(String domains) {

        domains = domains;

    public void setDomains(String newDomains) {

        domains = newDomains;

    }

}

core/java/android/net/StaticIpConfiguration.java

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ public class StaticIpConfiguration implements Parcelable { 
        for (InetAddress dns : dnsServers) {

            lp.addDnsServer(dns);

        }

        lp.setDomains(domains);

        return lp;

    }