Merge "Fix emulator dns." (f268ed9c) · Commits · e / os / android_frameworks_base

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;
		}