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

Commit a21622df authored by Paul Jensen's avatar Paul Jensen Committed by android-build-merger
Browse files

am 021a95f7: Merge "Fix DhcpResults.setDomain() and... 

am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev
automerge: 6ad91cbc

* commit '6ad91cbc':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
parents c45d74f8 6ad91cbc

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
@@ -107,6 +107,7 @@ public class StaticIpConfiguration implements Parcelable { 
        for (InetAddress dns : dnsServers) {

            lp.addDnsServer(dns);

        }

        lp.setDomains(domains);

        return lp;

    }