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

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

Merge "Fix null gsm/cdma message in sendImsSms"

parents f03e4995 4495b995

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

+2 −0
Original line number Diff line number Diff line
@@ -295,8 +295,10 @@ public class RadioMessagingProxy extends RadioServiceProxy { 
            if (gsmPdu != null) {

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

                        RILUtils.convertToHalGsmSmsMessageAidl(smscPdu, gsmPdu)};

                msg.cdmaMessage = new android.hardware.radio.messaging.CdmaSmsMessage[0];

            }

            if (cdmaPdu != null) {

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

                msg.cdmaMessage = new android.hardware.radio.messaging.CdmaSmsMessage[]{

                        RILUtils.convertToHalCdmaSmsMessageAidl(cdmaPdu)};

            }