Merge "QualcommRIL: Update getDataState override" into ics (f305d1a2) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/HTCQualcommRIL.java

+0 −43

Original line number	Diff line number	Diff line
		@@ -41,49 +41,6 @@ public class HTCQualcommRIL extends QualcommSharedRIL implements CommandsInterfa
		super(context, networkMode, cdmaSubscription);
		}

		@Override
		protected DataCallState
		getDataCallState(Parcel p, int version) {
		DataCallState dataCall = new DataCallState();
		dataCall.version = version;

		if (version < 5) {
		dataCall.cid = p.readInt();
		dataCall.active = p.readInt();
		dataCall.type = p.readString();
		String addresses = p.readString();
		if (!TextUtils.isEmpty(addresses)) {
		dataCall.addresses = addresses.split(" ");
		}
		} else {
		dataCall.status = p.readInt();
		dataCall.suggestedRetryTime = p.readInt();
		dataCall.cid = p.readInt();
		dataCall.active = p.readInt();
		dataCall.type = p.readString();
		dataCall.ifname = p.readString();
		if (dataCall.status == DataConnection.FailCause.NONE.getErrorCode()
		&& TextUtils.isEmpty(dataCall.ifname)
		&& dataCall.active != 0) {
		throw new RuntimeException("getDataCallState, no ifname");
		}
		String addresses = p.readString();
		if (!TextUtils.isEmpty(addresses)) {
		dataCall.addresses = addresses.split(" ");
		}
		String dnses = p.readString();
		if (!TextUtils.isEmpty(dnses)) {
		dataCall.dnses = dnses.split(" ");
		}
		String gateways = p.readString();
		if (!TextUtils.isEmpty(gateways)) {
		dataCall.gateways = gateways.split(" ");
		}
		}

		return dataCall;
		}

		@Override
		protected Object
		responseIccCardStatus(Parcel p) {

+2 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,8 @@ public class QualcommSharedRIL extends RIL implements CommandsInterface {
		dataCall.cid = 0; // Integer.parseInt(p.readString());
		p.readString();
		dataCall.ifname = p.readString();
		if (TextUtils.isEmpty(dataCall.ifname)) {
		if ((dataCall.status == DataConnection.FailCause.NONE.getErrorCode()) &&
		TextUtils.isEmpty(dataCall.ifname) && dataCall.active != 0) {
		throw new RuntimeException(
		"RIL_REQUEST_SETUP_DATA_CALL response, no ifname");
		}