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

Commit 6fefb33a authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix emulator dns. 

Really fix it this time.  The previous fix had a flaw which tested ok but was removed
after a code review.  This flaw masked problems in DataConnection, which this fix
fixes.

bug:2849192
Change-Id: I50d2dd827d4427f8030c0f590c85672869b509ff
parent 11811612

telephony/java/com/android/internal/telephony/DataConnection.java

+14 −10
Original line number Diff line number Diff line
@@ -419,17 +419,14 @@ public abstract class DataConnection extends HierarchicalStateMachine { 
            if (response.length >= 2) {

                cid = Integer.parseInt(response[0]);

                interfaceName = response[1];

                if (response.length > 2) {

                    ipAddress = response[2];



                String prefix = "net." + interfaceName + ".";

                gatewayAddress = SystemProperties.get(prefix + "gw");

                dnsServers[0] = SystemProperties.get(prefix + "dns1");

                dnsServers[1] = SystemProperties.get(prefix + "dns2");

                    if (DBG) {

                        log("interface=" + interfaceName + " ipAddress=" + ipAddress

                            + " gateway=" + gatewayAddress + " DNS1=" + dnsServers[0]

                            + " DNS2=" + dnsServers[1]);

                    }



                if (response.length > 2) {

                    ipAddress = response[2];



                    if (isDnsOk(dnsServers)) {

                        result = SetupResult.SUCCESS;
@@ -444,7 +441,14 @@ public abstract class DataConnection extends HierarchicalStateMachine { 
            }

        }



        if (DBG) log("DataConnection setup result='" + result + "' on cid=" + cid);

        if (DBG) {

            log("DataConnection setup result='" + result + "' on cid=" + cid);

            if (result == SetupResult.SUCCESS) {

                log("interface=" + interfaceName + " ipAddress=" + ipAddress

                        + " gateway=" + gatewayAddress + " DNS1=" + dnsServers[0]

                        + " DNS2=" + dnsServers[1]);

            }

        }

        return result;

    }