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

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

+0 −1

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

	@VisibleForTesting		@VisibleForTesting
	public void fallbackToPstn(SmsTracker tracker) {		public void fallbackToPstn(SmsTracker tracker) {
	tracker.mMessageRef = nextMessageRef();
	mSmsDispatchersController.sendRetrySms(tracker);		mSmsDispatchersController.sendRetrySms(tracker);
	}		}

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

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -342,9 +342,6 @@ public class ImsSmsDispatcherTest extends TelephonyTest {
	public void testFallbackGsmRetrywithMessageRef() throws Exception {		public void testFallbackGsmRetrywithMessageRef() throws Exception {
	int token = mImsSmsDispatcher.mNextToken.get();		int token = mImsSmsDispatcher.mNextToken.get();
	int messageRef = mImsSmsDispatcher.nextMessageRef();		int messageRef = mImsSmsDispatcher.nextMessageRef();
	if (mImsSmsDispatcher.isMessageRefIncrementViaTelephony()) {
	messageRef += 1;
	}

	when(mImsManager.getSmsFormat()).thenReturn(SmsMessage.FORMAT_3GPP);		when(mImsManager.getSmsFormat()).thenReturn(SmsMessage.FORMAT_3GPP);
	when(mPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);		when(mPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
	@@ -363,12 +360,8 @@ public class ImsSmsDispatcherTest extends TelephonyTest {
	ArgumentCaptor<SMSDispatcher.SmsTracker> captor =		ArgumentCaptor<SMSDispatcher.SmsTracker> captor =
	ArgumentCaptor.forClass(SMSDispatcher.SmsTracker.class);		ArgumentCaptor.forClass(SMSDispatcher.SmsTracker.class);
	verify(mSmsDispatchersController).sendRetrySms(captor.capture());		verify(mSmsDispatchersController).sendRetrySms(captor.capture());
	if (mImsSmsDispatcher.isMessageRefIncrementViaTelephony()) {
	assertTrue(messageRef + 1 == captor.getValue().mMessageRef);
	} else {
	assertTrue(messageRef == captor.getValue().mMessageRef);		assertTrue(messageRef == captor.getValue().mMessageRef);
	}		}
	}

	@Test		@Test
	public void testErrorImsRetrywithMessageRef() throws Exception {		public void testErrorImsRetrywithMessageRef() throws Exception {