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

Commit 4a813c59 authored by Sarah Chin's avatar Sarah Chin
Browse files

Integrate IRadioNetwork into telephony 

Test: RILTest
Bug: 198331673
Change-Id: I7e53dfee396d6052befe6f70cd2f5528b1a720b0
parent 7dbcb984

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

+370 −699

File changed.

Preview size limit exceeded, changes collapsed.

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

+168 −20
Original line number Diff line number Diff line
@@ -550,34 +550,23 @@ public class RILUtils { 
            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++) {

            byte[] digits = new byte[addrNbrOfDigits];

            for (int i = 0; i < 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 = new byte[subaddrNbrOfDigits];

            for (int i = 0; i < 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++) {

            byte[] bearerData = new byte[bearerDataLength];

            for (int i = 0; i < bearerDataLength; i++) {

                bearerData[i] = dis.readByte(); //bearerData[i]

            }

            msg.bearerData = bearerData;
@@ -872,8 +861,8 @@ public class RILUtils { 
        dpi.protocol = dp.getProtocolType();

        dpi.roamingProtocol = dp.getRoamingProtocolType();

        dpi.authType = dp.getAuthType();

        dpi.user = TextUtils.emptyIfNull(dp.getUserName());

        dpi.password = TextUtils.emptyIfNull(dp.getPassword());

        dpi.user = convertNullToEmptyString(dp.getUserName());

        dpi.password = convertNullToEmptyString(dp.getPassword());

        dpi.type = dp.getType();

        dpi.maxConnsTime = dp.getMaxConnectionsTime();

        dpi.maxConns = dp.getMaxConnections();
@@ -1224,6 +1213,54 @@ public class RILUtils { 
        return rasInHalFormat;

    }



    /**

     * Convert to RadioAccessSpecifier defined in RadioAccessSpecifier.aidl

     * @param ras Radio access specifier

     * @return The converted RadioAccessSpecifier

     */

    public static android.hardware.radio.network.RadioAccessSpecifier

            convertToHalRadioAccessSpecifierAidl(RadioAccessSpecifier ras) {

        android.hardware.radio.network.RadioAccessSpecifier rasInHalFormat =

                new android.hardware.radio.network.RadioAccessSpecifier();

        android.hardware.radio.network.RadioAccessSpecifierBands bandsInHalFormat =

                new android.hardware.radio.network.RadioAccessSpecifierBands();

        rasInHalFormat.accessNetwork = convertToHalAccessNetworkAidl(ras.getRadioAccessNetwork());

        int[] bands = null;

        if (ras.getBands() != null) {

            bands = new int[ras.getBands().length];

            for (int i = 0; i < ras.getBands().length; i++) {

                bands[i] = ras.getBands()[i];

            }

        }

        switch (ras.getRadioAccessNetwork()) {

            case AccessNetworkConstants.AccessNetworkType.GERAN:

                bandsInHalFormat.geranBands(bands);

                break;

            case AccessNetworkConstants.AccessNetworkType.UTRAN:

                bandsInHalFormat.utranBands(bands);

                break;

            case AccessNetworkConstants.AccessNetworkType.EUTRAN:

                bandsInHalFormat.eutranBands(bands);

                break;

            case AccessNetworkConstants.AccessNetworkType.NGRAN:

                bandsInHalFormat.ngranBands(bands);

                break;

            default:

                return null;

        }

        rasInHalFormat.bands = bandsInHalFormat;



        if (ras.getChannels() != null) {

            int[] channels = new int[ras.getChannels().length];

            for (int i = 0; i < ras.getChannels().length; i++) {

                channels[i] = ras.getChannels()[i];

            }

            rasInHalFormat.channels = channels;

        }



        return rasInHalFormat;

    }



    /**

     * Convert to censored terminal response

     * @param terminalResponse Terminal response
@@ -1400,6 +1437,75 @@ public class RILUtils { 
        return (raf == 0) ? android.hardware.radio.V1_4.RadioAccessFamily.UNKNOWN : raf;

    }



    /**

     * Convert to RadioAccessFamily defined in RadioAccessFamily.aidl

     * @param networkTypeBitmask {@link TelephonyManager.NetworkTypeBitMask}, the bitmask

     *        represented by {@link android.telephony.Annotation.NetworkType}

     * @return The converted RadioAccessFamily

     */

    public static int convertToHalRadioAccessFamilyAidl(

            @TelephonyManager.NetworkTypeBitMask int networkTypeBitmask) {

        int raf = 0;



        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_GSM) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.GSM;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_GPRS) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.GPRS;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_EDGE) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.EDGE;

        }

        // convert CDMA to IS95A, consistent with ServiceState.networkTypeToRilRadioTechnology

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_CDMA) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.IS95A;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.ONE_X_RTT;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_0) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.EVDO_0;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_A) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.EVDO_A;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_B) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.EVDO_B;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_EHRPD) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.EHRPD;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_HSUPA) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.HSUPA;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_HSDPA) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.HSDPA;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_HSPA) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.HSPA;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_HSPAP) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.HSPAP;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_UMTS) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.UMTS;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.TD_SCDMA;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_LTE) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.LTE;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_LTE_CA) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.LTE_CA;

        }

        if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_NR) != 0) {

            raf |= android.hardware.radio.RadioAccessFamily.NR;

        }

        // TODO: need hal definition for IWLAN

        return (raf == 0) ? android.hardware.radio.RadioAccessFamily.UNKNOWN : raf;

    }



    /**

     * Convert AccessNetworkType to AccessNetwork defined in radio/1.5/types.hal

     * @param accessNetworkType Access network type
@@ -1425,6 +1531,31 @@ public class RILUtils { 
        }

    }



    /**

     * Convert AccessNetworkType to AccessNetwork.aidl

     * @param accessNetworkType Access network type

     * @return The converted AccessNetwork

     */

    public static int convertToHalAccessNetworkAidl(int accessNetworkType) {

        switch (accessNetworkType) {

            case AccessNetworkConstants.AccessNetworkType.GERAN:

                return android.hardware.radio.AccessNetwork.GERAN;

            case AccessNetworkConstants.AccessNetworkType.UTRAN:

                return android.hardware.radio.AccessNetwork.UTRAN;

            case AccessNetworkConstants.AccessNetworkType.EUTRAN:

                return android.hardware.radio.AccessNetwork.EUTRAN;

            case AccessNetworkConstants.AccessNetworkType.CDMA2000:

                return android.hardware.radio.AccessNetwork.CDMA2000;

            case AccessNetworkConstants.AccessNetworkType.IWLAN:

                return android.hardware.radio.AccessNetwork.IWLAN;

            case AccessNetworkConstants.AccessNetworkType.NGRAN:

                return android.hardware.radio.AccessNetwork.NGRAN;

            case AccessNetworkConstants.AccessNetworkType.UNKNOWN:

            default:

                return android.hardware.radio.AccessNetwork.UNKNOWN;

        }

    }



    /**

     * Convert AccessNetworkType to RadioAccessNetwork defined in radio/1.1/types.hal

     * @param accessNetworkType Access network type
@@ -1547,6 +1678,23 @@ public class RILUtils { 
        return signalThresholdInfoHal;

    }



    /**

     * Convert to SignalThresholdInfo defined in SignalThresholdInfo.aidl

     * @param signalThresholdInfo Signal threshold info

     * @return The converted SignalThresholdInfo

     */

    public static android.hardware.radio.network.SignalThresholdInfo

            convertToHalSignalThresholdInfoAidl(SignalThresholdInfo signalThresholdInfo) {

        android.hardware.radio.network.SignalThresholdInfo signalThresholdInfoHal =

                new android.hardware.radio.network.SignalThresholdInfo();

        signalThresholdInfoHal.signalMeasurement = signalThresholdInfo.getSignalMeasurementType();

        signalThresholdInfoHal.hysteresisMs = signalThresholdInfo.getHysteresisMs();

        signalThresholdInfoHal.hysteresisDb = signalThresholdInfo.getHysteresisDb();

        signalThresholdInfoHal.thresholds = signalThresholdInfo.getThresholds();

        signalThresholdInfoHal.isEnabled = signalThresholdInfo.isEnabled();

        return signalThresholdInfoHal;

    }



    /**

     * Convert StatusOnIcc to SmsWriteArgsStatus defined in radio/1.0/types.hal

     * @param status StatusOnIcc

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

+6 −14
Original line number Diff line number Diff line
@@ -415,23 +415,15 @@ public class RadioDataProxy extends RadioServiceProxy { 


            final InetAddress srcAddress = packetData.getSrcAddress();

            final InetAddress dstAddress = packetData.getDstAddress();

            byte[] sourceAddress =

                    new byte[srcAddress.getAddress().length + req.sourceAddress.length];

            for (int i = 0; i < req.sourceAddress.length; i++) {

                sourceAddress[i] = req.sourceAddress[i];

            }

            for (int i = req.sourceAddress.length; i < sourceAddress.length; i++) {

                sourceAddress[i] = srcAddress.getAddress()[i - req.sourceAddress.length];

            byte[] sourceAddress = new byte[srcAddress.getAddress().length];

            for (int i = 0; i < sourceAddress.length; i++) {

                sourceAddress[i] = srcAddress.getAddress()[i];

            }

            req.sourceAddress = sourceAddress;

            req.sourcePort = packetData.getSrcPort();

            byte[] destinationAddress =

                    new byte[dstAddress.getAddress().length + req.destinationAddress.length];

            for (int i = 0; i < req.destinationAddress.length; i++) {

                destinationAddress[i] = req.destinationAddress[i];

            }

            for (int i = req.destinationAddress.length; i < destinationAddress.length; i++) {

                destinationAddress[i] = dstAddress.getAddress()[i - req.destinationAddress.length];

            byte[] destinationAddress = new byte[dstAddress.getAddress().length];

            for (int i = 0; i < destinationAddress.length; i++) {

                destinationAddress[i] = dstAddress.getAddress()[i];

            }

            req.destinationAddress = destinationAddress;

            req.destinationPort = packetData.getDstPort();

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

+9 −24
Original line number Diff line number Diff line
@@ -303,15 +303,8 @@ public class RadioMessagingProxy extends RadioServiceProxy { 
            msg.tech = android.hardware.radio.RadioTechnologyFamily.THREE_GPP;

            msg.retry = (byte) retry >= 1;

            msg.messageRef = messageRef;



            android.hardware.radio.messaging.GsmSmsMessage[] gsmMessages =

                    new android.hardware.radio.messaging.GsmSmsMessage[msg.gsmMessage.length + 1];

            for (int i = 0; i < msg.gsmMessage.length; i++) {

                gsmMessages[i] = msg.gsmMessage[i];

            }

            gsmMessages[msg.gsmMessage.length] =

                    RILUtils.convertToHalGsmSmsMessageAidl(smscPdu, pdu);

            msg.gsmMessage = gsmMessages;

            msg.gsmMessage = new android.hardware.radio.messaging.GsmSmsMessage[] {

                    RILUtils.convertToHalGsmSmsMessageAidl(smscPdu, pdu)};

            mMessagingProxy.sendImsSms(serial, msg);

        } else {

            android.hardware.radio.V1_0.ImsSmsMessage msg =
@@ -319,10 +312,7 @@ public class RadioMessagingProxy extends RadioServiceProxy { 
            msg.tech = android.hardware.radio.V1_0.RadioTechnologyFamily.THREE_GPP;

            msg.retry = (byte) retry >= 1;

            msg.messageRef = messageRef;



            android.hardware.radio.V1_0.GsmSmsMessage gsmMsg =

                    RILUtils.convertToHalGsmSmsMessage(smscPdu, pdu);

            msg.gsmMessage.add(gsmMsg);

            msg.gsmMessage.add(RILUtils.convertToHalGsmSmsMessage(smscPdu, pdu));

            mRadioProxy.sendImsSms(serial, msg);

        }

    }
@@ -422,13 +412,8 @@ public class RadioMessagingProxy extends RadioServiceProxy { 
                    halConfigs.add(info);

                }

            }

            android.hardware.radio.messaging.CdmaBroadcastSmsConfigInfo[] halConfigsArr =

                    new android.hardware.radio.messaging.CdmaBroadcastSmsConfigInfo[

                            halConfigs.size()];

            for (int i = 0; i < halConfigs.size(); i++) {

                halConfigsArr[i] = halConfigs.get(i);

            }

            mMessagingProxy.setCdmaBroadcastConfig(serial, halConfigsArr);

            mMessagingProxy.setCdmaBroadcastConfig(serial, halConfigs.stream().toArray(

                    android.hardware.radio.messaging.CdmaBroadcastSmsConfigInfo[]::new));

        } else {

            ArrayList<android.hardware.radio.V1_0.CdmaBroadcastSmsConfigInfo> halConfigs =

                    new ArrayList<>();
@@ -566,15 +551,15 @@ public class RadioMessagingProxy extends RadioServiceProxy { 
            android.hardware.radio.messaging.SmsWriteArgs args =

                    new android.hardware.radio.messaging.SmsWriteArgs();

            args.status = RILUtils.convertToHalSmsWriteArgsStatusAidl(status);

            args.smsc = RILUtils.convertNullToEmptyString(smsc);

            args.pdu = RILUtils.convertNullToEmptyString(pdu);

            args.smsc = smsc;

            args.pdu = pdu;

            mMessagingProxy.writeSmsToSim(serial, args);

        } else {

            android.hardware.radio.V1_0.SmsWriteArgs args =

                    new android.hardware.radio.V1_0.SmsWriteArgs();

            args.status = RILUtils.convertToHalSmsWriteArgsStatus(status);

            args.smsc = RILUtils.convertNullToEmptyString(smsc);

            args.pdu = RILUtils.convertNullToEmptyString(pdu);

            args.smsc = smsc;

            args.pdu = pdu;

            mRadioProxy.writeSmsToSim(serial, args);

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -221,13 +221,13 @@ public class RadioModemProxy extends RadioServiceProxy { 
            android.hardware.radio.modem.NvWriteItem item =

                    new android.hardware.radio.modem.NvWriteItem();

            item.itemId = itemId;

            item.value = RILUtils.convertNullToEmptyString(itemValue);

            item.value = itemValue;

            mModemProxy.nvWriteItem(serial, item);

        } else {

            android.hardware.radio.V1_0.NvWriteItem item =

                    new android.hardware.radio.V1_0.NvWriteItem();

            item.itemId = itemId;

            item.value = RILUtils.convertNullToEmptyString(itemValue);

            item.value = itemValue;

            mRadioProxy.nvWriteItem(serial, item);

        }

    }