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

Commit 497d2910 authored by Megha Patil's avatar Megha Patil
Browse files

Keep the TP-MessageRef as is for SMS Fallback 

- For SMS Retry Over CS, the TP-MR was set to 0
- In case of retry over CS,  previous TP-MR is
sent to Modem

BUG: b/290816286
Test: atest ImsSmsDispatcherTest, Test SMS Fallback over live network,
Tested all SMS cases in lab with Bugid:b/291880473

Change-Id: If51929db121153061afc415452a090912d1d0a77
(cherry picked from commit 8bc27209)
parent d8592171

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

+0 −1
Original line number Diff line number Diff line
@@ -657,7 +657,6 @@ public class ImsSmsDispatcher extends SMSDispatcher { 


    @VisibleForTesting

    public void fallbackToPstn(SmsTracker tracker) {

        tracker.mMessageRef = nextMessageRef();

        mSmsDispatchersController.sendRetrySms(tracker);

    }

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

+1 −8
Original line number Diff line number Diff line
@@ -342,9 +342,6 @@ public class ImsSmsDispatcherTest extends TelephonyTest { 
    public void testFallbackGsmRetrywithMessageRef() throws Exception {

        int token = mImsSmsDispatcher.mNextToken.get();

        int messageRef = mImsSmsDispatcher.nextMessageRef();

        if (mImsSmsDispatcher.isMessageRefIncrementViaTelephony()) {

            messageRef += 1;

        }



        when(mImsManager.getSmsFormat()).thenReturn(SmsMessage.FORMAT_3GPP);

        when(mPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
@@ -363,12 +360,8 @@ public class ImsSmsDispatcherTest extends TelephonyTest { 
        ArgumentCaptor<SMSDispatcher.SmsTracker> captor =

                ArgumentCaptor.forClass(SMSDispatcher.SmsTracker.class);

        verify(mSmsDispatchersController).sendRetrySms(captor.capture());

        if (mImsSmsDispatcher.isMessageRefIncrementViaTelephony()) {

            assertTrue(messageRef + 1 == captor.getValue().mMessageRef);

        } else {

        assertTrue(messageRef == captor.getValue().mMessageRef);

    }

    }



    @Test

    public void testErrorImsRetrywithMessageRef() throws Exception {