Merge "Revert "[ANAPIC Review] Modify radio 1.6 in telephony side"" into sc-dev (46105414) · Commits · e / os / android_frameworks_opt_telephony

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

+11 −6

Original line number	Diff line number	Diff line
		@@ -498,13 +498,18 @@ public class CellularNetworkService extends NetworkService {
		info.eutranInfo().lteVopsInfo.isVopsSupported,
		info.eutranInfo().lteVopsInfo.isEmcBearerSupported);
		break;
		case AccessTechnologySpecificInfo.hidl_discriminator.ngranNrVopsInfo:
		vopsInfo = new NrVopsSupportInfo(info.ngranNrVopsInfo().vopsSupported,
		info.ngranNrVopsInfo().emcSupported,
		info.ngranNrVopsInfo().emfSupported);
		case AccessTechnologySpecificInfo.hidl_discriminator.ngranInfo:
		android.hardware.radio.V1_6.RegStateResult
		.AccessTechnologySpecificInfo.NgranRegistrationInfo ngranInfo =
		regResult.accessTechnologySpecificInfo.ngranInfo();
		vopsInfo = new NrVopsSupportInfo(ngranInfo.nrVopsInfo.vopsSupported,
		ngranInfo.nrVopsInfo.emcSupported, ngranInfo.nrVopsInfo.emfSupported);
		break;
		case AccessTechnologySpecificInfo.hidl_discriminator.geranDtmSupported:
		cssSupported = info.geranDtmSupported();
		case AccessTechnologySpecificInfo.hidl_discriminator.geranInfo:
		android.hardware.radio.V1_6.RegStateResult
		.AccessTechnologySpecificInfo.GeranRegistrationInfo geranInfo =
		regResult.accessTechnologySpecificInfo.geranInfo();
		cssSupported = geranInfo.dtmSupported;
		break;
		default:
		log("No access tech specific info passes for RegStateResult");

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -1825,7 +1825,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		try {
		android.hardware.radio.V1_6.IRadio radioProxy16 =
		(android.hardware.radio.V1_6.IRadio) radioProxy;
		radioProxy16.sendSmsExpectMore_1_6(rr.mSerial, msg);
		radioProxy16.sendSMSExpectMore_1_6(rr.mSerial, msg);
		mMetrics.writeRilSendSms(mPhoneId, rr.mSerial, SmsSession.Event.Tech.SMS_GSM,
		SmsSession.Event.Format.SMS_FORMAT_3GPP,
		getOutgoingSmsMessageId(result));
		@@ -3679,8 +3679,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}

		try {
		radioProxy16.setNrDualConnectivityState(rr.mSerial,
		(byte) nrDualConnectivityState);
		radioProxy16.setNrDualConnectivityState(rr.mSerial, nrDualConnectivityState);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "enableNRDualConnectivity", e);
		}
		@@ -5062,7 +5061,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}

		try {
		radioProxy16.setDataThrottling(rr.mSerial, (byte) dataThrottlingAction,
		radioProxy16.setDataThrottling(rr.mSerial, dataThrottlingAction,
		completionWindowMillis);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "setDataThrottling", e);
		@@ -5567,7 +5566,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		for (byte b : imsiEncryptionInfo.getPublicKey().getEncoded()) {
		halImsiInfo.base.carrierKey.add(new Byte(b));
		}
		halImsiInfo.keyType = (byte) imsiEncryptionInfo.getKeyType();
		halImsiInfo.keyType = imsiEncryptionInfo.getKeyType();

		radioProxy16.setCarrierInfoForImsiEncryption_1_6(
		rr.mSerial, halImsiInfo);

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1087,7 +1087,7 @@ public class RadioIndication extends IRadioIndication.Stub {
		* @param indicationType RadioIndicationType
		* @param records Content of the SIM phonebook records
		*/
		public void simPhonebookRecordsReceived(int indicationType, byte status,
		public void simPhonebookRecordsReceived(int indicationType, int status,
		ArrayList<PhonebookRecordInfo> records) {

		}
		@@ -1281,8 +1281,8 @@ public class RadioIndication extends IRadioIndication.Stub {
		convertConnectionStatusFromCellConnectionStatus(config.status))
		.setDownlinkChannelNumber(config.downlinkChannelNumber)
		.setUplinkChannelNumber(config.uplinkChannelNumber)
		.setCellBandwidthDownlinkKhz(config.cellBandwidthDownlinkKhz)
		.setCellBandwidthUplinkKhz(config.cellBandwidthUplinkKhz)
		.setCellBandwidthDownlinkKhz(config.cellBandwidthDownlink)
		.setCellBandwidthUplinkKhz(config.cellBandwidthUplink)
		.setNetworkType(ServiceState.rilRadioTechnologyToNetworkType(config.rat))
		.setPhysicalCellId(config.physicalCellId)
		.setContextIds(config.contextIds.stream().mapToInt(x -> x).toArray())

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -593,7 +593,7 @@ public class RadioResponse extends IRadioResponse.Stub {
		* is defined in 1.6/types.hal
		* @param sms Response to sms sent as defined by SendSmsResult in 1.6/types.hal
		*/
		public void sendSmsExpectMoreResponse_1_6(
		public void sendSMSExpectMoreResponse_1_6(
		android.hardware.radio.V1_6.RadioResponseInfo responseInfo,
		SendSmsResult sms) {
		responseSms_1_6(responseInfo, sms);

tests/telephonytests/src/com/android/internal/telephony/CellSignalStrengthNrTest.java

+5 −14

Original line number	Diff line number	Diff line
		@@ -33,8 +33,6 @@ import org.junit.Test;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.List;
		import java.util.stream.Collectors;

		public class CellSignalStrengthNrTest extends AndroidTestCase {
		private static final int CSIRSRP = -123;
		@@ -45,18 +43,11 @@ public class CellSignalStrengthNrTest extends AndroidTestCase {
		private static final int INVALID_SSRSRP = Integer.MAX_VALUE;
		private static final int CSISINR = 18;
		private static final int CSICQI_TABLE_INDEX = 1;
		private static final ArrayList<Byte> CSICQI_REPORT =
		new ArrayList<>(Arrays.asList((byte) 3, (byte) 2, (byte) 1));
		private static final ArrayList<Integer> CSICQI_REPORT = new ArrayList<>(Arrays.asList(3, 2, 1));
		private static final int SSRSRP = -112;
		private static final int SSRSRQ = -13;
		private static final int SSSINR = 32;

		private List<Integer> getCsiCqiList() {
		return CSICQI_REPORT.stream()
		.map(cqi -> new Integer(Byte.toUnsignedInt(cqi)))
		.collect(Collectors.toList());
		}

		@Test
		public void testGetMethod() {
		// GIVEN an instance of CellSignalStrengthNr
		@@ -68,7 +59,7 @@ public class CellSignalStrengthNrTest extends AndroidTestCase {
		assertThat(css.getCsiRsrq()).isEqualTo(CSIRSRQ);
		assertThat(css.getCsiSinr()).isEqualTo(CSISINR);
		assertThat(css.getCsiCqiTableIndex()).isEqualTo(CSICQI_TABLE_INDEX);
		assertThat(css.getCsiCqiReport()).isEqualTo(getCsiCqiList());
		assertThat(css.getCsiCqiReport()).isEqualTo(CSICQI_REPORT);
		assertThat(css.getSsRsrp()).isEqualTo(SSRSRP);
		assertThat(css.getSsRsrq()).isEqualTo(SSRSRQ);
		assertThat(css.getSsSinr()).isEqualTo(SSSINR);
		@@ -94,7 +85,7 @@ public class CellSignalStrengthNrTest extends AndroidTestCase {
		assertThat(css.getCsiRsrq()).isEqualTo(CSIRSRQ);
		assertThat(css.getCsiSinr()).isEqualTo(CSISINR);
		assertThat(css.getCsiCqiTableIndex()).isEqualTo(CSICQI_TABLE_INDEX);
		assertThat(css.getCsiCqiReport()).isEqualTo(getCsiCqiList());
		assertThat(css.getCsiCqiReport()).isEqualTo(CSICQI_REPORT);
		assertThat(css.getSsRsrp()).isEqualTo(SSRSRP);
		assertThat(css.getSsRsrq()).isEqualTo(SSRSRQ);
		assertThat(css.getSsSinr()).isEqualTo(SSSINR);
		@@ -109,7 +100,7 @@ public class CellSignalStrengthNrTest extends AndroidTestCase {
		nrSignalStrength.base.csiRsrq = CellInfo.UNAVAILABLE;
		nrSignalStrength.base.csiSinr = CellInfo.UNAVAILABLE;
		nrSignalStrength.csiCqiTableIndex = CellInfo.UNAVAILABLE;
		nrSignalStrength.csiCqiReport = new ArrayList<Byte>();
		nrSignalStrength.csiCqiReport = new ArrayList<Integer>();
		nrSignalStrength.base.ssRsrp = CellInfo.UNAVAILABLE;
		nrSignalStrength.base.ssRsrq = CellInfo.UNAVAILABLE;
		nrSignalStrength.base.ssSinr = CellInfo.UNAVAILABLE;
		@@ -215,7 +206,7 @@ public class CellSignalStrengthNrTest extends AndroidTestCase {
		assertThat(anotherCss.getCsiRsrq()).isEqualTo(CSIRSRQ);
		assertThat(anotherCss.getCsiSinr()).isEqualTo(CSISINR);
		assertThat(css.getCsiCqiTableIndex()).isEqualTo(CSICQI_TABLE_INDEX);
		assertThat(css.getCsiCqiReport()).isEqualTo(getCsiCqiList());
		assertThat(css.getCsiCqiReport()).isEqualTo(CSICQI_REPORT);
		assertThat(anotherCss.getSsRsrp()).isEqualTo(SSRSRP);
		assertThat(anotherCss.getSsRsrq()).isEqualTo(SSRSRQ);
		assertThat(anotherCss.getSsSinr()).isEqualTo(SSSINR);