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

Commit a6ec49ca authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge changes from topic "iradio-integration" 

* changes:
  Final integration work for IRadio AIDL
  Integrate IRadioVoice into telephony
  Integrate IRadioSim into telephony
  Integrate IRadioNetwork into telephony
  Integrate IRadioModem into telephony
  Integrate IRadioMessaging into telephony
  Integrate IRadioData into telephony
parents 6d86bbbb 4fc1d4f3

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

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class DataIndication extends IRadioDataIndication.Stub { 
     */

    public void dataCallListChanged(int indicationType,

            android.hardware.radio.data.SetupDataCallResult[] dcList) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);



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

        ArrayList<DataCallResponse> response = RILUtils.convertHalDataCallResultList(dcList);
@@ -65,7 +65,7 @@ public class DataIndication extends IRadioDataIndication.Stub { 
     */

    public void keepaliveStatus(int indicationType,

            android.hardware.radio.data.KeepaliveStatus halStatus) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) {

            mRil.unsljLogRet(RIL_UNSOL_KEEPALIVE_STATUS, "handle=" + halStatus.sessionHandle
@@ -82,7 +82,7 @@ public class DataIndication extends IRadioDataIndication.Stub { 
     * @param pco New PcoData

     */

    public void pcoData(int indicationType, android.hardware.radio.data.PcoDataInfo pco) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);



        PcoData response = new PcoData(pco.cid, pco.bearerProto, pco.pcoId, pco.contents);
@@ -98,7 +98,7 @@ public class DataIndication extends IRadioDataIndication.Stub { 
     * @throws RemoteException

     */

    public void unthrottleApn(int indicationType, String apn) throws RemoteException {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_UNTHROTTLE_APN, apn);

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

+8 −8
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
     */

    public void cdmaNewSms(int indicationType,

            android.hardware.radio.messaging.CdmaSmsMessage msg) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_CDMA_NEW_SMS);
@@ -64,7 +64,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
     * @param indicationType Type of radio indication

     */

    public void cdmaRuimSmsStorageFull(int indicationType) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL);
@@ -83,7 +83,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
     *        BTS as coded in 3GPP 23.041 Section 9.4.2.2

     */

    public void newBroadcastSms(int indicationType, byte[] data) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) {

            mRil.unsljLogvRet(RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS,
@@ -102,7 +102,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
     *        The PDU starts with the SMSC address per TS 27.005 (+CMT:)

     */

    public void newSms(int indicationType, byte[] pdu) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);

        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS);



        SmsMessageBase smsb = com.android.internal.telephony.gsm.SmsMessage.createFromPdu(pdu);
@@ -118,7 +118,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
     * @param recordNumber Record number on the SIM

     */

    public void newSmsOnSim(int indicationType, int recordNumber) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM);
@@ -134,7 +134,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
     *        The PDU starts with the SMSC address per TS 27.005 (+CMT:)

     */

    public void newSmsStatusReport(int indicationType, byte[] pdu) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT);
@@ -151,7 +151,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
     * @param msg Message string in UTF-8, if applicable

     */

    public void onUssd(int indicationType, int ussdModeType, String msg) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogMore(RIL_UNSOL_ON_USSD, "" + ussdModeType);
@@ -169,7 +169,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
     * @param indicationType Type of radio indication

     */

    public void simSmsStorageFull(int indicationType) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_SIM_SMS_STORAGE_FULL);

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

+5 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class ModemIndication extends IRadioModemIndication.Stub { 
     */

    public void hardwareConfigChanged(int indicationType,

            android.hardware.radio.modem.HardwareConfig[] configs) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MODEM_SERVICE, indicationType);



        ArrayList<HardwareConfig> response = RILUtils.convertHalHardwareConfigList(configs);
@@ -62,7 +62,7 @@ public class ModemIndication extends IRadioModemIndication.Stub { 
     *        restart" that explains the cause of the modem restart

     */

    public void modemReset(int indicationType, String reason) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MODEM_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_MODEM_RESTART, reason);
@@ -78,7 +78,7 @@ public class ModemIndication extends IRadioModemIndication.Stub { 
     */

    public void radioCapabilityIndication(int indicationType,

            android.hardware.radio.modem.RadioCapability radioCapability) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MODEM_SERVICE, indicationType);



        RadioCapability response = RILUtils.convertHalRadioCapability(radioCapability, mRil);
@@ -94,7 +94,7 @@ public class ModemIndication extends IRadioModemIndication.Stub { 
     * @param radioState Current radio state

     */

    public void radioStateChanged(int indicationType, int radioState) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MODEM_SERVICE, indicationType);



        int state = RILUtils.convertHalRadioState(radioState);

        if (RIL.RILJ_LOGD) {
@@ -110,7 +110,7 @@ public class ModemIndication extends IRadioModemIndication.Stub { 
     * @param indicationType Type of radio indication

     */

    public void rilConnected(int indicationType) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.MODEM_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RIL_CONNECTED);

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

+14 −14
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
    public void barringInfoChanged(int indicationType,

            android.hardware.radio.network.CellIdentity cellIdentity,

            android.hardware.radio.network.BarringInfo[] barringInfos) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        if (cellIdentity == null || barringInfos == null) {

            AnomalyReporter.reportAnomaly(UUID.fromString("645b16bb-c930-4c1c-9c5d-568696542e05"),
@@ -91,7 +91,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     * @param version PRL version after PRL changes

     */

    public void cdmaPrlChanged(int indicationType, int version) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        int[] response = new int[]{version};
@@ -107,7 +107,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     */

    public void cellInfoList(int indicationType,

            android.hardware.radio.network.CellInfo[] records) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);

        ArrayList<CellInfo> response = RILUtils.convertHalCellInfoList(records);

        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_CELL_INFO_LIST, response);

        mRil.mRilCellInfoListRegistrants.notifyRegistrants(new AsyncResult(null, response, null));
@@ -120,7 +120,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     */

    public void currentLinkCapacityEstimate(int indicationType,

            android.hardware.radio.network.LinkCapacityEstimate lce) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        List<LinkCapacityEstimate> response = RILUtils.convertHalLceData(lce);
@@ -138,7 +138,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     */

    public void currentPhysicalChannelConfigs(int indicationType,

            android.hardware.radio.network.PhysicalChannelConfig[] configs) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);

        List<PhysicalChannelConfig> response = new ArrayList<>(configs.length);

        for (android.hardware.radio.network.PhysicalChannelConfig config : configs) {

            PhysicalChannelConfig.Builder builder = new PhysicalChannelConfig.Builder();
@@ -182,7 +182,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     */

    public void currentSignalStrength(int indicationType,

            android.hardware.radio.network.SignalStrength signalStrength) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        SignalStrength ssInitial = RILUtils.convertHalSignalStrength(signalStrength);
@@ -200,7 +200,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     * @param indicationType Type of radio indication

     */

    public void imsNetworkStateChanged(int indicationType) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED);
@@ -214,7 +214,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     */

    public void networkScanResult(int indicationType,

            android.hardware.radio.network.NetworkScanResult result) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        ArrayList<CellInfo> cellInfos = RILUtils.convertHalCellInfoList(result.networkInfos);

        NetworkScanResult nsr = new NetworkScanResult(result.status, result.error, cellInfos);
@@ -227,7 +227,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     * @param indicationType Type of radio indication

     */

    public void networkStateChanged(int indicationType) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_NETWORK_STATE_CHANGED);
@@ -247,7 +247,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     */

    public void nitzTimeReceived(int indicationType, String nitzTime,

        @ElapsedRealtimeLong long receivedTimeMs, long ageMs) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_NITZ_TIME_RECEIVED, nitzTime);
@@ -294,7 +294,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
    public void registrationFailed(int indicationType,

            android.hardware.radio.network.CellIdentity cellIdentity, String chosenPlmn,

            @NetworkRegistrationInfo.Domain int domain, int causeCode, int additionalCauseCode) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);

        CellIdentity ci = RILUtils.convertHalCellIdentity(cellIdentity);

        if (ci == null || TextUtils.isEmpty(chosenPlmn)

                || (domain & NetworkRegistrationInfo.DOMAIN_CS_PS) == 0
@@ -319,7 +319,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     * @param state Bitmask of restricted state as defined by PhoneRestrictedState

     */

    public void restrictedStateChanged(int indicationType, int state) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogvRet(RIL_UNSOL_RESTRICTED_STATE_CHANGED, state);
@@ -335,7 +335,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     */

    public void suppSvcNotify(int indicationType,

            android.hardware.radio.network.SuppSvcNotification suppSvcNotification) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        SuppServiceNotification notification = new SuppServiceNotification();

        notification.notificationType = suppSvcNotification.isMT ? 1 : 0;
@@ -357,7 +357,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
     * @param rat Current new voice rat

     */

    public void voiceRadioTechChanged(int indicationType, int rat) {

        mRil.processIndication(indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        int[] response = new int[] {rat};

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

+1625 −2260

File changed.

Preview size limit exceeded, changes collapsed.