Merge "Keep the TP-MessageRef as is for SMS Fallback" into udc-qpr-dev (7dd7dc87) · Commits · e / os / android_frameworks_opt_telephony

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

+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 {