Merge "Fix data connection support on emulator." (081b7d7b) · Commits · e / os / android_frameworks_base

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

+24 −16

Original line number	Diff line number	Diff line
		@@ -389,9 +389,14 @@ public abstract class DataConnection extends HierarchicalStateMachine {
		}
		result = SetupResult.ERR_Stale;
		} else {
		// log("onSetupConnectionCompleted received " + response.length + " response strings:");
		// for (int i = 0; i < response.length; i++) {
		// log(" response[" + i + "]='" + response[i] + "'");
		// }
		if (response.length >= 2) {
		cid = Integer.parseInt(response[0]);
		if (response.length > 2) {
		interfaceName = response[1];
		if (response.length > 2) {
		ipAddress = response[2];
		String prefix = "net." + interfaceName + ".";
		gatewayAddress = SystemProperties.get(prefix + "gw");
		@@ -408,12 +413,15 @@ public abstract class DataConnection extends HierarchicalStateMachine {
		} else {
		result = SetupResult.ERR_BadDns;
		}
		} else {
		result = SetupResult.SUCCESS;
		}
		} else {
		result = SetupResult.ERR_Other;
		}
		}

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