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

Commit 87eea9fe authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Fix null gsm/cdma message in sendImsSms" am: cea6af1f am: 307f8a02... 

Merge "Fix null gsm/cdma message in sendImsSms" am: cea6af1f am: 307f8a02 am: 4f12f005 am: d1d4cafe

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



Change-Id: I0535cf13230a86583e064f536bccd264c5943cf1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 998a1393 d1d4cafe

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

            }