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

Commit d3c00916 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Populate the correct format in ImsSmsMessage."

parents 89010e95 8f5c2e85

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

+3 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.hardware.radio.V1_0.RadioError; 
import android.hardware.radio.V1_0.RadioIndicationType;

import android.hardware.radio.V1_0.RadioResponseInfo;

import android.hardware.radio.V1_0.RadioResponseType;

import android.hardware.radio.V1_0.RadioTechnologyFamily;

import android.hardware.radio.V1_0.ResetNvType;

import android.hardware.radio.V1_0.SelectUiccSub;

import android.hardware.radio.V1_0.SimApdu;
@@ -4087,7 +4088,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));



            ImsSmsMessage msg = new ImsSmsMessage();

            msg.tech = RILConstants.GSM_PHONE;

            msg.tech = RadioTechnologyFamily.THREE_GPP;

            msg.retry = (byte) retry >= 1 ? true : false;

            msg.messageRef = messageRef;
@@ -4114,7 +4115,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));



            ImsSmsMessage msg = new ImsSmsMessage();

            msg.tech = RILConstants.CDMA_PHONE;

            msg.tech = RadioTechnologyFamily.THREE_GPP2;

            msg.retry = (byte) retry >= 1 ? true : false;

            msg.messageRef = messageRef;

tests/telephonytests/src/com/android/internal/telephony/RILTest.java

+5 −4
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ import android.hardware.radio.V1_0.NvWriteItem; 
import android.hardware.radio.V1_0.RadioError;

import android.hardware.radio.V1_0.RadioResponseInfo;

import android.hardware.radio.V1_0.RadioResponseType;

import android.hardware.radio.V1_0.RadioTechnologyFamily;

import android.hardware.radio.V1_0.SmsWriteArgs;

import android.hardware.radio.V1_5.IRadio;

import android.hardware.radio.deprecated.V1_0.IOemHook;
@@ -928,13 +929,13 @@ public class RILTest extends TelephonyTest { 
        gsmMsg.pdu = pdu;



        ImsSmsMessage firstMsg = new ImsSmsMessage();

        firstMsg.tech = RILConstants.GSM_PHONE;

        firstMsg.tech = RadioTechnologyFamily.THREE_GPP;

        firstMsg.retry = false;

        firstMsg.messageRef = 0;

        firstMsg.gsmMessage.add(gsmMsg);



        ImsSmsMessage retryMsg = new ImsSmsMessage();

        retryMsg.tech = RILConstants.GSM_PHONE;

        retryMsg.tech = RadioTechnologyFamily.THREE_GPP;

        retryMsg.retry = true;

        retryMsg.messageRef = 0;

        retryMsg.gsmMessage.add(gsmMsg);
@@ -963,13 +964,13 @@ public class RILTest extends TelephonyTest { 
        CdmaSmsMessage cdmaMsg = new CdmaSmsMessage();



        ImsSmsMessage firstMsg = new ImsSmsMessage();

        firstMsg.tech = RILConstants.CDMA_PHONE;

        firstMsg.tech = RadioTechnologyFamily.THREE_GPP2;

        firstMsg.retry = false;

        firstMsg.messageRef = 0;

        firstMsg.cdmaMessage.add(cdmaMsg);



        ImsSmsMessage retryMsg = new ImsSmsMessage();

        retryMsg.tech = RILConstants.CDMA_PHONE;

        retryMsg.tech = RadioTechnologyFamily.THREE_GPP2;

        retryMsg.retry = true;

        retryMsg.messageRef = 0;

        retryMsg.cdmaMessage.add(cdmaMsg);