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

Commit bfc901e7 authored by Luca Stefani's avatar Luca Stefani
Browse files

fixup! RadioMessagingProxy: Fix sending CDMA IMS SMS 

There is no real fix here as the underlying value is the same
in AIDL and HIDL HALs.

This also removes the default tech assignment to GSM
and only does that in case the PDU is for GSM as they
are/should be mutually exclusive.

Change-Id: I92a999748c6873e72e669d866e304b6314e8d51d
parent 8c4c75ac

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

+3 −3
Original line number Diff line number Diff line
@@ -289,10 +289,10 @@ public class RadioMessagingProxy extends RadioServiceProxy { 
        if (isAidl()) {

            android.hardware.radio.messaging.ImsSmsMessage msg =

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

            msg.tech = android.hardware.radio.RadioTechnologyFamily.THREE_GPP;

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

            msg.messageRef = messageRef;

            if (gsmPdu != null) {

                msg.tech = android.hardware.radio.RadioTechnologyFamily.THREE_GPP;

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

                        RILUtils.convertToHalGsmSmsMessageAidl(smscPdu, gsmPdu)};

                msg.cdmaMessage = new android.hardware.radio.messaging.CdmaSmsMessage[0];
@@ -307,14 +307,14 @@ public class RadioMessagingProxy extends RadioServiceProxy { 
        } else {

            android.hardware.radio.V1_0.ImsSmsMessage msg =

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

            msg.tech = android.hardware.radio.V1_0.RadioTechnologyFamily.THREE_GPP;

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

            msg.messageRef = messageRef;

            if (gsmPdu != null) {

                msg.tech = android.hardware.radio.V1_0.RadioTechnologyFamily.THREE_GPP;

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

            }

            if (cdmaPdu != null) {

                msg.tech = android.hardware.radio.RadioTechnologyFamily.THREE_GPP2;

                msg.tech = android.hardware.radio.V1_0.RadioTechnologyFamily.THREE_GPP2;

                msg.cdmaMessage.add(RILUtils.convertToHalCdmaSmsMessage(cdmaPdu));

            }

            mRadioProxy.sendImsSms(serial, msg);