Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdccf36a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[ANAPIC Review] Modify radio 1.6 in telephony side" am: 097e6df5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1683009

Change-Id: I2f5196007e3d437935ce58a289762fdea909b479
parents 3bda8bdd 097e6df5

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

+6 −11
Original line number Diff line number Diff line
@@ -498,18 +498,13 @@ public class CellularNetworkService extends NetworkService { 
                            info.eutranInfo().lteVopsInfo.isVopsSupported,

                            info.eutranInfo().lteVopsInfo.isEmcBearerSupported);

                    break;

                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);

                case AccessTechnologySpecificInfo.hidl_discriminator.ngranNrVopsInfo:

                    vopsInfo = new NrVopsSupportInfo(info.ngranNrVopsInfo().vopsSupported,

                            info.ngranNrVopsInfo().emcSupported,

                            info.ngranNrVopsInfo().emfSupported);

                    break;

                case AccessTechnologySpecificInfo.hidl_discriminator.geranInfo:

                    android.hardware.radio.V1_6.RegStateResult

                            .AccessTechnologySpecificInfo.GeranRegistrationInfo geranInfo =

                            regResult.accessTechnologySpecificInfo.geranInfo();

                    cssSupported = geranInfo.dtmSupported;

                case AccessTechnologySpecificInfo.hidl_discriminator.geranDtmSupported:

                    cssSupported = info.geranDtmSupported();

                    break;

                default:

                    log("No access tech specific info passes for RegStateResult");

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

+5 −4
Original line number Diff line number Diff line
@@ -1824,7 +1824,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));
@@ -3678,7 +3678,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            }



            try {

                radioProxy16.setNrDualConnectivityState(rr.mSerial, nrDualConnectivityState);

                radioProxy16.setNrDualConnectivityState(rr.mSerial,

                        (byte) nrDualConnectivityState);

            } catch (RemoteException | RuntimeException e) {

                handleRadioProxyExceptionForRR(rr, "enableNRDualConnectivity", e);

            }
@@ -5060,7 +5061,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            }



            try {

                radioProxy16.setDataThrottling(rr.mSerial, dataThrottlingAction,

                radioProxy16.setDataThrottling(rr.mSerial, (byte) dataThrottlingAction,

                        completionWindowMillis);

            } catch (RemoteException | RuntimeException e) {

                handleRadioProxyExceptionForRR(rr, "setDataThrottling", e);
@@ -5565,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 = imsiEncryptionInfo.getKeyType();

                    halImsiInfo.keyType = (byte) 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, int status,

    public void simPhonebookRecordsReceived(int indicationType, byte 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.cellBandwidthDownlink)

                        .setCellBandwidthUplinkKhz(config.cellBandwidthUplink)

                        .setCellBandwidthDownlinkKhz(config.cellBandwidthDownlinkKhz)

                        .setCellBandwidthUplinkKhz(config.cellBandwidthUplinkKhz)

                        .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
@@ -590,7 +590,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

+14 −5
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 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;
@@ -43,11 +45,18 @@ 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<Integer> CSICQI_REPORT = new ArrayList<>(Arrays.asList(3, 2, 1));

    private static final ArrayList<Byte> CSICQI_REPORT =

            new ArrayList<>(Arrays.asList((byte) 3, (byte) 2, (byte) 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
@@ -59,7 +68,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(CSICQI_REPORT);

        assertThat(css.getCsiCqiReport()).isEqualTo(getCsiCqiList());

        assertThat(css.getSsRsrp()).isEqualTo(SSRSRP);

        assertThat(css.getSsRsrq()).isEqualTo(SSRSRQ);

        assertThat(css.getSsSinr()).isEqualTo(SSSINR);
@@ -85,7 +94,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(CSICQI_REPORT);

        assertThat(css.getCsiCqiReport()).isEqualTo(getCsiCqiList());

        assertThat(css.getSsRsrp()).isEqualTo(SSRSRP);

        assertThat(css.getSsRsrq()).isEqualTo(SSRSRQ);

        assertThat(css.getSsSinr()).isEqualTo(SSSINR);
@@ -100,7 +109,7 @@ public class CellSignalStrengthNrTest extends AndroidTestCase { 
        nrSignalStrength.base.csiRsrq = CellInfo.UNAVAILABLE;

        nrSignalStrength.base.csiSinr = CellInfo.UNAVAILABLE;

        nrSignalStrength.csiCqiTableIndex = CellInfo.UNAVAILABLE;

        nrSignalStrength.csiCqiReport = new ArrayList<Integer>();

        nrSignalStrength.csiCqiReport = new ArrayList<Byte>();

        nrSignalStrength.base.ssRsrp = CellInfo.UNAVAILABLE;

        nrSignalStrength.base.ssRsrq = CellInfo.UNAVAILABLE;

        nrSignalStrength.base.ssSinr = CellInfo.UNAVAILABLE;
@@ -206,7 +215,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(CSICQI_REPORT);

        assertThat(css.getCsiCqiReport()).isEqualTo(getCsiCqiList());

        assertThat(anotherCss.getSsRsrp()).isEqualTo(SSRSRP);

        assertThat(anotherCss.getSsRsrq()).isEqualTo(SSRSRQ);

        assertThat(anotherCss.getSsSinr()).isEqualTo(SSSINR);