Merge "Connected with data service manager" am: f3c8d0fa74 (3d56b273) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -1956,11 +1956,6 @@ public class GsmCdmaPhone extends Phone {
		return mCT.getMute();
		}

		@Override
		public void getDataCallList(Message response) {
		mCi.getDataCallList(response);
		}

		@Override
		public void updateServiceLocation() {
		mSST.enableSingleLocationUpdate();

src/java/com/android/internal/telephony/PhoneInternalInterface.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -735,19 +735,6 @@ public interface PhoneInternalInterface {
		*/
		boolean getMute();

		/**
		* Get the current active Data Call list
		*
		* @param response <strong>On success</strong>, "response" bytes is
		* made available as:
		* (String[])(((AsyncResult)response.obj).result).
		* <strong>On failure</strong>,
		* (((AsyncResult)response.obj).result) == null and
		* (((AsyncResult)response.obj).exception) being an instance of
		* com.android.internal.telephony.gsm.CommandException
		*/
		void getDataCallList(Message response);

		/**
		* Update the ServiceState CellLocation for current network registration.
		*/

src/java/com/android/internal/telephony/RIL.java

+1 −95

Original line number	Diff line number	Diff line
		@@ -48,15 +48,12 @@ import android.hardware.radio.V1_0.RadioResponseInfo;
		import android.hardware.radio.V1_0.RadioResponseType;
		import android.hardware.radio.V1_0.ResetNvType;
		import android.hardware.radio.V1_0.SelectUiccSub;
		import android.hardware.radio.V1_0.SetupDataCallResult;
		import android.hardware.radio.V1_0.SimApdu;
		import android.hardware.radio.V1_0.SmsWriteArgs;
		import android.hardware.radio.V1_0.UusInfo;
		import android.net.ConnectivityManager;
		import android.net.KeepalivePacketData;
		import android.net.LinkAddress;
		import android.net.LinkProperties;
		import android.net.NetworkUtils;
		import android.os.AsyncResult;
		import android.os.Build;
		import android.os.Handler;
		@@ -87,7 +84,6 @@ import android.telephony.SignalStrength;
		import android.telephony.SmsManager;
		import android.telephony.TelephonyHistogram;
		import android.telephony.TelephonyManager;
		import android.telephony.data.DataCallResponse;
		import android.telephony.data.DataProfile;
		import android.telephony.data.DataService;
		import android.text.TextUtils;
		@@ -1136,103 +1132,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
		return -1;
		}

		/**
		* Convert SetupDataCallResult defined in types.hal into DataCallResponse
		* @param dcResult setup data call result
		* @return converted DataCallResponse object
		*/
		static DataCallResponse convertDataCallResult(SetupDataCallResult dcResult) {

		// Process address
		String[] addresses = null;
		if (!TextUtils.isEmpty(dcResult.addresses)) {
		addresses = dcResult.addresses.split("\\s+");
		}

		List<LinkAddress> laList = new ArrayList<>();
		if (addresses != null) {
		for (String address : addresses) {
		address = address.trim();
		if (address.isEmpty()) continue;

		try {
		LinkAddress la;
		// Check if the address contains prefix length. If yes, LinkAddress
		// can parse that.
		if (address.split("/").length == 2) {
		la = new LinkAddress(address);
		} else {
		InetAddress ia = NetworkUtils.numericToInetAddress(address);
		la = new LinkAddress(ia, (ia instanceof Inet4Address) ? 32 : 128);
		}

		laList.add(la);
		} catch (IllegalArgumentException e) {
		Rlog.e(RILJ_LOG_TAG, "Unknown address: " + address + ", " + e);
		}
		}
		}

		// Process dns
		String[] dnses = null;
		if (!TextUtils.isEmpty(dcResult.dnses)) {
		dnses = dcResult.dnses.split("\\s+");
		}

		List<InetAddress> dnsList = new ArrayList<>();
		if (dnses != null) {
		for (String dns : dnses) {
		dns = dns.trim();
		InetAddress ia;
		try {
		ia = NetworkUtils.numericToInetAddress(dns);
		dnsList.add(ia);
		} catch (IllegalArgumentException e) {
		Rlog.e(RILJ_LOG_TAG, "Unknown dns: " + dns + ", exception = " + e);
		}
		}
		}

		// Process gateway
		String[] gateways = null;
		if (!TextUtils.isEmpty(dcResult.gateways)) {
		gateways = dcResult.gateways.split("\\s+");
		}

		List<InetAddress> gatewayList = new ArrayList<>();
		if (gateways != null) {
		for (String gateway : gateways) {
		gateway = gateway.trim();
		InetAddress ia;
		try {
		ia = NetworkUtils.numericToInetAddress(gateway);
		gatewayList.add(ia);
		} catch (IllegalArgumentException e) {
		Rlog.e(RILJ_LOG_TAG, "Unknown gateway: " + gateway + ", exception = " + e);
		}
		}
		}

		return new DataCallResponse(dcResult.status,
		dcResult.suggestedRetryTime,
		dcResult.cid,
		dcResult.active,
		dcResult.type,
		dcResult.ifname,
		laList,
		dnsList,
		gatewayList,
		new ArrayList<>(Arrays.asList(dcResult.pcscf.trim().split("\\s+"))),
		dcResult.mtu
		);
		}

		@Override
		public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,
		boolean allowRoaming, int reason, LinkProperties linkProperties,
		Message result) {

		IRadio radioProxy = getRadioProxy(result);

		if (radioProxy != null) {

		RILRequest rr = obtainRequest(RIL_REQUEST_SETUP_DATA_CALL, result,

src/java/com/android/internal/telephony/RadioIndication.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -89,7 +89,6 @@ import android.telephony.CellInfo;
		import android.telephony.PcoData;
		import android.telephony.SignalStrength;
		import android.telephony.SmsMessage;
		import android.telephony.data.DataCallResponse;

		import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;
		import com.android.internal.telephony.cdma.CdmaInformationRecords;
		@@ -254,16 +253,10 @@ public class RadioIndication extends IRadioIndication.Stub {
		public void dataCallListChanged(int indicationType, ArrayList<SetupDataCallResult> dcList) {
		mRil.processIndication(indicationType);

		ArrayList<DataCallResponse> response = new ArrayList<>();

		for (SetupDataCallResult dcResult : dcList) {
		response.add(RIL.convertDataCallResult(dcResult));
		}

		if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, response);
		if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, dcList);

		mRil.mDataCallListChangedRegistrants.notifyRegistrants(
		new AsyncResult(null, response, null));
		new AsyncResult(null, dcList, null));
		}

		public void suppSvcNotify(int indicationType, SuppSvcNotification suppSvcNotification) {

src/java/com/android/internal/telephony/RadioResponse.java

+4 −10

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import android.telephony.PhoneNumberUtils;
		import android.telephony.SignalStrength;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.telephony.data.DataCallResponse;
		import android.text.TextUtils;

		import com.android.internal.telephony.dataconnection.KeepaliveStatus;
		@@ -1672,11 +1671,10 @@ public class RadioResponse extends IRadioResponse.Stub {
		RILRequest rr = mRil.processResponse(responseInfo);

		if (rr != null) {
		DataCallResponse ret = RIL.convertDataCallResult(setupDataCallResult);
		if (responseInfo.error == RadioError.NONE) {
		sendMessageResponse(rr.mResult, ret);
		sendMessageResponse(rr.mResult, setupDataCallResult);
		}
		mRil.processResponseDone(rr, responseInfo, ret);
		mRil.processResponseDone(rr, responseInfo, setupDataCallResult);
		}
		}

		@@ -1767,14 +1765,10 @@ public class RadioResponse extends IRadioResponse.Stub {
		RILRequest rr = mRil.processResponse(responseInfo);

		if (rr != null) {
		ArrayList<DataCallResponse> dcResponseList = new ArrayList<>();
		for (SetupDataCallResult dcResult : dataCallResultList) {
		dcResponseList.add(RIL.convertDataCallResult(dcResult));
		}
		if (responseInfo.error == RadioError.NONE) {
		sendMessageResponse(rr.mResult, dcResponseList);
		sendMessageResponse(rr.mResult, dataCallResultList);
		}
		mRil.processResponseDone(rr, responseInfo, dcResponseList);
		mRil.processResponseDone(rr, responseInfo, dataCallResultList);
		}
		}