Merge "The re-try flag is not set to true when re-sending SMS at second time" (d28dd923) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -3077,7 +3077,7 @@ public class RIL extends BaseCommands implements CommandsInterface {

		ImsSmsMessage msg = new ImsSmsMessage();
		msg.tech = RILConstants.GSM_PHONE;
		msg.retry = (byte) retry == 1 ? true : false;
		msg.retry = (byte) retry >= 1 ? true : false;
		msg.messageRef = messageRef;

		GsmSmsMessage gsmMsg = constructGsmSendSmsRilRequest(smscPdu, pdu);
		@@ -3104,7 +3104,7 @@ public class RIL extends BaseCommands implements CommandsInterface {

		ImsSmsMessage msg = new ImsSmsMessage();
		msg.tech = RILConstants.CDMA_PHONE;
		msg.retry = (byte) retry == 1 ? true : false;
		msg.retry = (byte) retry >= 1 ? true : false;
		msg.messageRef = messageRef;

		CdmaSmsMessage cdmaMsg = new CdmaSmsMessage();

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

+78 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_HANGUP;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_IMS_REGISTRATION_STATE;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_IMS_SEND_SMS;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_ISIM_AUTHENTICATION;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_LAST_CALL_FAIL_CAUSE;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_NV_READ_ITEM;
		@@ -87,12 +88,15 @@ import static org.mockito.Matchers.eq;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;

		import android.content.Context;
		import android.content.pm.ApplicationInfo;
		import android.hardware.radio.V1_0.DataProfileInfo;
		import android.hardware.radio.V1_0.CdmaSmsMessage;
		import android.hardware.radio.V1_0.GsmSmsMessage;
		import android.hardware.radio.V1_0.ImsSmsMessage;
		import android.hardware.radio.V1_0.IRadio;
		import android.hardware.radio.V1_0.NvWriteItem;
		import android.hardware.radio.V1_0.RadioError;
		@@ -704,6 +708,80 @@ public class RILTest extends TelephonyTest {
		}

		@FlakyTest
		@Test
		public void testSendRetryImsGsmSms() throws Exception {
		String smscPdu = "smscPdu";
		String pdu = "pdu";
		GsmSmsMessage gsmMsg = new GsmSmsMessage();
		gsmMsg.smscPdu = smscPdu;
		gsmMsg.pdu = pdu;

		ImsSmsMessage firstMsg = new ImsSmsMessage();
		firstMsg.tech = RILConstants.GSM_PHONE;
		firstMsg.retry = false;
		firstMsg.messageRef = 0;
		firstMsg.gsmMessage.add(gsmMsg);

		ImsSmsMessage retryMsg = new ImsSmsMessage();
		retryMsg.tech = RILConstants.GSM_PHONE;
		retryMsg.retry = true;
		retryMsg.messageRef = 0;
		retryMsg.gsmMessage.add(gsmMsg);

		int maxRetryCount = 3;
		int firstTransmission = 0;
		for (int i = 0; i <= maxRetryCount; i++) {
		mRILUnderTest.sendImsGsmSms(smscPdu, pdu, i, 0, obtainMessage());
		if (i == firstTransmission) {
		verify(mRadioProxy, times(1)).sendImsSms(mSerialNumberCaptor.capture(),
		eq(firstMsg));
		verifyRILResponse(mRILUnderTest, mSerialNumberCaptor.getValue(),
		RIL_REQUEST_IMS_SEND_SMS);
		} else {
		verify(mRadioProxy, times(i)).sendImsSms(mSerialNumberCaptor.capture(),
		eq(retryMsg));
		verifyRILResponse(mRILUnderTest, mSerialNumberCaptor.getValue(),
		RIL_REQUEST_IMS_SEND_SMS);
		}
		}
		}

		@FlakyTest
		@Test
		public void testSendRetryImsCdmaSms() throws Exception {
		CdmaSmsMessage cdmaMsg = new CdmaSmsMessage();

		ImsSmsMessage firstMsg = new ImsSmsMessage();
		firstMsg.tech = RILConstants.CDMA_PHONE;
		firstMsg.retry = false;
		firstMsg.messageRef = 0;
		firstMsg.cdmaMessage.add(cdmaMsg);

		ImsSmsMessage retryMsg = new ImsSmsMessage();
		retryMsg.tech = RILConstants.CDMA_PHONE;
		retryMsg.retry = true;
		retryMsg.messageRef = 0;
		retryMsg.cdmaMessage.add(cdmaMsg);

		int maxRetryCount = 3;
		int firstTransmission = 0;
		byte pdu[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
		for (int i = 0; i <= maxRetryCount; i++) {
		mRILUnderTest.sendImsCdmaSms(pdu, i, 0, obtainMessage());
		if (i == firstTransmission) {
		verify(mRadioProxy, times(1)).sendImsSms(mSerialNumberCaptor.capture(),
		eq(firstMsg));
		verifyRILResponse(mRILUnderTest, mSerialNumberCaptor.getValue(),
		RIL_REQUEST_IMS_SEND_SMS);
		} else {
		verify(mRadioProxy, times(i)).sendImsSms(mSerialNumberCaptor.capture(),
		eq(retryMsg));
		verifyRILResponse(mRILUnderTest, mSerialNumberCaptor.getValue(),
		RIL_REQUEST_IMS_SEND_SMS);
		}
		}
		}

		@Test
		public void testIccOpenLogicalChannel() throws Exception {
		String aid = "aid";