Merge changes If93b80b4,Ia9148203 (7dbcb984) · Commits · e / os / android_frameworks_opt_telephony

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

+308 −429

File changed.

Preview size limit exceeded, changes collapsed.

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

+119 −3

Original line number	Diff line number	Diff line
		@@ -454,7 +454,7 @@ public class RILUtils {

		/**
		* Convert to GsmSmsMessage defined in radio/1.0/types.hal
		* @param smscPdu SMSD address
		* @param smscPdu SMSC address
		* @param pdu SMS in PDU format
		* @return A converted GsmSmsMessage
		*/
		@@ -467,6 +467,21 @@ public class RILUtils {
		return msg;
		}

		/**
		* Convert to GsmSmsMessage defined in GsmSmsMessage.aidl
		* @param smscPdu SMSC address
		* @param pdu SMS in PDU format
		* @return A converted GsmSmsMessage
		*/
		public static android.hardware.radio.messaging.GsmSmsMessage convertToHalGsmSmsMessageAidl(
		String smscPdu, String pdu) {
		android.hardware.radio.messaging.GsmSmsMessage msg =
		new android.hardware.radio.messaging.GsmSmsMessage();
		msg.smscPdu = RILUtils.convertNullToEmptyString(smscPdu);
		msg.pdu = RILUtils.convertNullToEmptyString(pdu);
		return msg;
		}

		/**
		* Convert to CdmaSmsMessage defined in radio/1.0/types.hal
		* @param pdu SMS in PDU format
		@@ -510,6 +525,67 @@ public class RILUtils {
		return msg;
		}

		/**
		* Convert to CdmaSmsMessage defined in CdmaSmsMessage.aidl
		* @param pdu SMS in PDU format
		* @return A converted CdmaSmsMessage
		*/
		public static android.hardware.radio.messaging.CdmaSmsMessage convertToHalCdmaSmsMessageAidl(
		byte[] pdu) {
		android.hardware.radio.messaging.CdmaSmsMessage msg =
		new android.hardware.radio.messaging.CdmaSmsMessage();
		int addrNbrOfDigits;
		int subaddrNbrOfDigits;
		int bearerDataLength;
		ByteArrayInputStream bais = new ByteArrayInputStream(pdu);
		DataInputStream dis = new DataInputStream(bais);

		try {
		msg.teleserviceId = dis.readInt(); // teleServiceId
		msg.isServicePresent = (byte) dis.readInt() == 1; // servicePresent
		msg.serviceCategory = dis.readInt(); // serviceCategory
		msg.address.digitMode = dis.read(); // address digit mode
		msg.address.isNumberModeDataNetwork =
		dis.read() == CdmaSmsAddress.NUMBER_MODE_DATA_NETWORK; // address number mode
		msg.address.numberType = dis.read(); // address number type
		msg.address.numberPlan = dis.read(); // address number plan
		addrNbrOfDigits = (byte) dis.read();
		byte[] digits = new byte[msg.address.digits.length + addrNbrOfDigits];
		for (int i = 0; i < msg.address.digits.length; i++) {
		digits[i] = msg.address.digits[i];
		}
		for (int i = msg.address.digits.length; i < msg.address.digits.length + addrNbrOfDigits;
		i++) {
		digits[i] = dis.readByte(); // address_orig_bytes[i]
		}
		msg.address.digits = digits;
		msg.subAddress.subaddressType = dis.read(); //subaddressType
		msg.subAddress.odd = (byte) dis.read() == 1; //subaddr odd
		subaddrNbrOfDigits = (byte) dis.read();
		digits = new byte[msg.subAddress.digits.length + subaddrNbrOfDigits];
		for (int i = 0; i < msg.subAddress.digits.length; i++) {
		digits[i] = msg.subAddress.digits[i];
		}
		for (int i = msg.subAddress.digits.length;
		i < msg.subAddress.digits.length + subaddrNbrOfDigits; i++) {
		digits[i] = dis.readByte(); //subaddr_orig_bytes[i]
		}
		msg.subAddress.digits = digits;

		bearerDataLength = dis.read();
		byte[] bearerData = new byte[msg.bearerData.length + bearerDataLength];
		for (int i = 0; i < msg.bearerData.length; i++) {
		bearerData[i] = msg.bearerData[i];
		}
		for (int i = msg.bearerData.length; i < msg.bearerData.length + bearerDataLength; i++) {
		bearerData[i] = dis.readByte(); //bearerData[i]
		}
		msg.bearerData = bearerData;
		} catch (IOException ex) {
		}
		return msg;
		}

		/**
		* Convert CdmaSmsMessage defined in radio/1.0/types.hal to SmsMessage
		* Note only primitive fields are set
		@@ -937,6 +1013,26 @@ public class RILUtils {
		return -1;
		}

		/**
		* Convert to ResetNvType defined in ResetNvType.aidl
		* @param resetType NV reset type
		* @return The converted reset type in integer or -1 if param is invalid
		*/
		public static int convertToHalResetNvTypeAidl(int resetType) {
		/**
		* resetType values
		* 1 - reload all NV items
		* 2 - erase NV reset (SCRTN)
		* 3 - factory reset (RTN)
		*/
		switch (resetType) {
		case 1: return android.hardware.radio.modem.ResetNvType.RELOAD;
		case 2: return android.hardware.radio.modem.ResetNvType.ERASE;
		case 3: return android.hardware.radio.modem.ResetNvType.FACTORY_RESET;
		}
		return -1;
		}

		/**
		* Convert to a list of LinkAddress defined in radio/1.5/types.hal
		* @param linkProperties Link properties
		@@ -1471,6 +1567,26 @@ public class RILUtils {
		}
		}

		/**
		* Convert StatusOnIcc to statuses defined in SmsWriteArgs.aidl
		* @param status StatusOnIcc
		* @return The converted statuses defined in SmsWriteArgs.aidl
		*/
		public static int convertToHalSmsWriteArgsStatusAidl(int status) {
		switch (status & 0x7) {
		case SmsManager.STATUS_ON_ICC_READ:
		return android.hardware.radio.messaging.SmsWriteArgs.STATUS_REC_READ;
		case SmsManager.STATUS_ON_ICC_UNREAD:
		return android.hardware.radio.messaging.SmsWriteArgs.STATUS_REC_UNREAD;
		case SmsManager.STATUS_ON_ICC_SENT:
		return android.hardware.radio.messaging.SmsWriteArgs.STATUS_STO_SENT;
		case SmsManager.STATUS_ON_ICC_UNSENT:
		return android.hardware.radio.messaging.SmsWriteArgs.STATUS_STO_UNSENT;
		default:
		return android.hardware.radio.messaging.SmsWriteArgs.STATUS_REC_READ;
		}
		}

		/**
		* Convert a list of HardwareConfig defined in radio/1.0/types.hal to a list of HardwareConfig
		* @param hwListRil List of HardwareConfig defined in radio/1.0/types.hal

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

0 → 100644

+581 −0

File added.

Preview size limit exceeded, changes collapsed.

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

0 → 100644

+336 −0

File added.

Preview size limit exceeded, changes collapsed.