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

Commit 5c5b5b21 authored by Ramya Manoharan's avatar Ramya Manoharan Committed by Megha Patil
Browse files

CATService STK SEND_SMS via framework error handling 

RP_ERRORS and RP_ERROR_CAUSES handling for stk sms sent
Test: Run atest, Manually Tested By Sending STK SMS in Device
Bug: 243123292

Change-Id: I68ca1dc30c49b7cfd175e0da452cc0c2f34d1715
parent 83e50b48

src/java/com/android/internal/telephony/cat/CatService.java

+45 −16
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.telephony.SubscriptionInfo; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneFactory;
@@ -209,9 +210,8 @@ public class CatService extends Handler implements AppInterface { 
        CatLog.d(this, "Running CAT service on Slotid: " + mSlotId +

                ". STK app installed:" + mStkAppInstalled);



        SmsBroadcastReceiver smsBroadcastReceiver = new SmsBroadcastReceiver();

        mContext.registerReceiver(smsBroadcastReceiver, new IntentFilter(SMS_DELIVERY_ACTION));

        mContext.registerReceiver(smsBroadcastReceiver, new IntentFilter(SMS_SENT_ACTION));

        mContext.registerReceiver(mSmsBroadcastReceiver, new IntentFilter(SMS_DELIVERY_ACTION));

        mContext.registerReceiver(mSmsBroadcastReceiver, new IntentFilter(SMS_SENT_ACTION));

    }



    /**
@@ -629,21 +629,49 @@ public class CatService extends Handler implements AppInterface { 
                deliveryPendingIntent, false, 0L, true, true);

    }



    private class SmsBroadcastReceiver extends BroadcastReceiver {

    /**

     * BroadcastReceiver class to handle error and success cases of

     * SEND and DELIVERY pending intents used for sending of STK SMS

     */

    @VisibleForTesting

    public final BroadcastReceiver mSmsBroadcastReceiver = new BroadcastReceiver() {



        @Override

        public void onReceive(Context context, Intent intent) {

            CommandDetails commandDetails = (CommandDetails) intent.getExtra("cmdDetails");

            if (intent.getAction().equals(SMS_SENT_ACTION)) {

                int resultCode = getResultCode();

                switch (resultCode) {

                    case Activity.RESULT_OK:

                        break;

                    default:

                        //ToDO handle Error cases bug : b/243123292

                        CatLog.d(this, "Error sending STK SMS : " + resultCode);

                        sendTerminalResponse(commandDetails, ResultCode.SMS_RP_ERROR, true,

                                ResultCode.NETWORK_CRNTLY_UNABLE_TO_PROCESS.value(), null);

                ResultCode terminalResponseResultCode = ResultCode.NETWORK_CRNTLY_UNABLE_TO_PROCESS;

                CatLog.d(this, "STK SMS errorCode : " + resultCode);

                int additionalInfo = 0;

                if (resultCode != Activity.RESULT_OK) {

                    /**

                     * The Terminal Response Result code is assigned as per Section 12.12.3

                     * and 12.12.5 TS 101.267. The Result code SMS_RP_ERROR is added in Ims Case

                     * and additional information is added as per RP-Cause Values in TS 124.011.

                     * The Result code NETWORK_CRNTLY_UNABLE_TO_PROCESS is added in non-Ims Case

                     * and additional information added as per cause values in TS 04.08.

                     */

                    if (intent.hasExtra("ims") && intent.getBooleanExtra("ims", false)) {

                        terminalResponseResultCode = ResultCode.SMS_RP_ERROR;

                        //Additional information's 8th bit is 0 as per section 12.12.5 of TS 101.267

                        if (intent.hasExtra("errorCode")) {

                            additionalInfo = (int) intent.getExtra("errorCode");

                            if ((additionalInfo & 0x80) != 0) additionalInfo = 0;

                        }

                    } else {

                        //Additional information's 8th bit is 1 as per section 12.12.3 of TS 101.267

                        if (intent.hasExtra("errorCode")) {

                            additionalInfo = (int) intent.getExtra("errorCode");

                            additionalInfo |= 0x80;

                        }

                    }

                    CatLog.d(this, "Error delivering STK SMS errorCode : " + additionalInfo

                            + " terminalResponseResultCode = " + terminalResponseResultCode);

                    sendTerminalResponse(commandDetails, terminalResponseResultCode,

                            true, additionalInfo, null);

                } else {

                    CatLog.d(this, " STK SMS sent successfully ");

                }

            }

            if (intent.getAction().equals(SMS_DELIVERY_ACTION)) {
@@ -651,16 +679,17 @@ public class CatService extends Handler implements AppInterface { 
                switch (resultCode) {

                    case Activity.RESULT_OK:

                        sendTerminalResponse(commandDetails, ResultCode.OK, false, 0, null);

                        CatLog.d(this, " STK SMS delivered successfully ");

                        break;

                    default:

                        //ToDO handle Error cases bug: b/243123292

                        CatLog.d(this, "Error delivering STK SMS : " + resultCode);

                        sendTerminalResponse(commandDetails, ResultCode.SMS_RP_ERROR, true,

                                ResultCode.TERMINAL_CRNTLY_UNABLE_TO_PROCESS.value(), null);

                }

                        sendTerminalResponse(commandDetails,

                                ResultCode.TERMINAL_CRNTLY_UNABLE_TO_PROCESS, false,

                                0, null);

                }

            }

        }

    };



    private void broadcastCatCmdIntent(CatCmdMessage cmdMsg) {

        Intent intent = new Intent(AppInterface.CAT_CMD_ACTION);

tests/telephonytests/src/com/android/internal/telephony/cat/CATServiceTest.java

+125 −2
Original line number Diff line number Diff line
@@ -24,10 +24,17 @@ import static org.mockito.ArgumentMatchers.nullable; 
import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.anyLong;

import static org.mockito.Mockito.anyString;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.Activity;

import android.content.BroadcastReceiver;

import android.content.Intent;

import android.os.UserHandle;

import android.telephony.SmsManager;

import android.telephony.SmsMessage;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;
@@ -35,6 +42,7 @@ import android.testing.TestableLooper; 
import com.android.internal.telephony.ProxyController;

import com.android.internal.telephony.SmsController;

import com.android.internal.telephony.TelephonyTest;

import com.android.internal.telephony.test.SimulatedCommands;

import com.android.internal.telephony.uicc.IccCardApplicationStatus;

import com.android.internal.telephony.uicc.IccCardStatus;

import com.android.internal.telephony.uicc.IccFileHandler;
@@ -57,6 +65,10 @@ import java.util.List; 
@TestableLooper.RunWithLooper

public class CATServiceTest extends TelephonyTest {



    private static final String SMS_SENT_ACTION =

            "com.android.internal.telephony.cat.SMS_SENT_ACTION";

    private static final String SMS_DELIVERY_ACTION =

            "com.android.internal.telephony.cat.SMS_DELIVERY_ACTION";

    //Mocked Classes

    @Mock

    private RilMessageDecoder mRilMessageDecoder;
@@ -66,7 +78,6 @@ public class CATServiceTest extends TelephonyTest { 
    private CatService mCatService;

    private IccCardStatus mIccCardStatus;

    private IccIoResult mIccIoResult;



    private String mData =

            "D059810301130082028183051353656E64696E672072657175657374202E2E2E0607911989548056780B"

                    + "3051FF05812143F500F6082502700000201115001500BFFF01BA23C2169EA9B02D7A7FBAA0"
@@ -74,6 +85,27 @@ public class CATServiceTest extends TelephonyTest { 
    private byte[] mRawdata = IccUtils.hexStringToBytes(mData);

    private List<ComprehensionTlv> mCtlvs;



    /**

     * Terminal Response with result code in last 3 bytes = length + SMS_RP_ERROR(0x35)

     * + ErrorCode(= 41)

     */

    private String mTerminalResponseForSmsRpError = "81030113000202828183023529";



    /**

     * Terminal Response with result code in last 3 bytes = length + NETWORK_UNABLE_TO_PROCESS(0x21)

     * + ErrorCode(= 41 with 8th bit set to 1)

     */

    private String mTerminalResponseForNetworkUnableToProcess = "810301130002028281830221A9";



    /**

     * Terminal Response with result code in last 2 bytes = length

     * + TERMINAL_UNABLE_TO_PROCESS(0x20)

     */

    private String mTerminalResponseForTerminalUnableToProcess = "810301130002028281830120";



    //Terminal Response with result code(0x00)for delivery success in last 2 bytes

    private String mTerminalResponseForDeliverySuccess = "810301130002028281830100";



    public CATServiceTest() {

        super();

    }
@@ -109,13 +141,14 @@ public class CATServiceTest extends TelephonyTest { 
                mIccCardStatus.mImsSubscriptionAppIndex =

                        mIccCardStatus.mGsmUmtsSubscriptionAppIndex = -1;

        mIccIoResult = new IccIoResult(0x90, 0x00, IccUtils.hexStringToBytes("FF40"));

        mSimulatedCommands = mock(SimulatedCommands.class);

        mSimulatedCommands.setIccIoResultForApduLogicalChannel(mIccIoResult);

        mUiccProfile = new UiccProfile(mContext, mSimulatedCommands, mIccCardStatus,

                0 /* phoneId */, mUiccCard, new Object());

        processAllMessages();

        logd("Created UiccProfile");

        processAllMessages();

        mCatService = CatService.getInstance(mSimulatedCommands, mUiccController.mContext,

        mCatService = CatService.getInstance(mSimulatedCommands, mContext,

                mUiccProfile, mUiccController.getSlotIdFromPhoneId(0));

        logd("Created CATService");

        createCommandDetails();
@@ -124,12 +157,20 @@ public class CATServiceTest extends TelephonyTest { 


    @After

    public void tearDown() throws Exception {

        mCatService.dispose();

        mUiccProfile = null;

        mCatService = null;

        mCtlvs = null;

        mProxyController = null;

        mRilMessageDecoder = null;

        mCommandDetails = null;

        mContext = null;

        mSimulatedCommands = null;

        mIccCardStatus = null;

        mIccCard = null;

        mIccFileHandler = null;

        mIccIoResult = null;

        mSmsController = null;

        super.tearDown();

    }
@@ -189,4 +230,86 @@ public class CATServiceTest extends TelephonyTest { 
                "com.android.internal.telephony");

    }



    //Create and assign a PendingResult object in BroadcastReceiver with which resultCode is updated

    private void setBroadcastReceiverPendingResult(BroadcastReceiver receiver, int resultCode) {

        BroadcastReceiver.PendingResult pendingResult =

                new BroadcastReceiver.PendingResult(resultCode,

                        "resultData",

                        /* resultExtras= */ null,

                        BroadcastReceiver.PendingResult.TYPE_UNREGISTERED,

                        /* ordered= */ true,

                        /* sticky= */ false,

                        /* token= */ null,

                        UserHandle.myUserId(),

                        /* flags= */ 0);

        receiver.setPendingResult(pendingResult);

    }



    @Test

    public void testSendTerminalResponseForSendSuccess() {

        setBroadcastReceiverPendingResult(mCatService.mSmsBroadcastReceiver, Activity.RESULT_OK);

        Intent intent = new Intent(SMS_SENT_ACTION).putExtra("cmdDetails", mCommandDetails);

        intent.putExtra("ims", true);

        mContext.sendOrderedBroadcast(intent, null, mCatService.mSmsBroadcastReceiver, null,

                Activity.RESULT_OK, null, null);

        processAllMessages();

        verify(mSimulatedCommands, never()).sendTerminalResponse(

                any(), any());

    }



    @Test

    public void testSendTerminalResponseForSendSmsRpError() {

        setBroadcastReceiverPendingResult(mCatService.mSmsBroadcastReceiver,

                SmsManager.RESULT_ERROR_GENERIC_FAILURE);

        Intent intent = new Intent(SMS_SENT_ACTION).putExtra("cmdDetails", mCommandDetails);

        intent.putExtra("ims", true);

        intent.putExtra("errorCode", 41);

        mContext.sendOrderedBroadcast(intent, null, mCatService.mSmsBroadcastReceiver, null,

                SmsManager.RESULT_ERROR_GENERIC_FAILURE, null, null);

        processAllMessages();

        //Verify if the command is encoded with correct Result byte as per TS 101.267

        verify(mSimulatedCommands, atLeastOnce()).sendTerminalResponse(

                eq(mTerminalResponseForSmsRpError), any());

    }



    @Test

    public void testSendTerminalResponseForSendSmsNetworkError() {

        setBroadcastReceiverPendingResult(mCatService.mSmsBroadcastReceiver,

                SmsManager.RESULT_ERROR_GENERIC_FAILURE);

        Intent intent = new Intent(SMS_SENT_ACTION).putExtra("cmdDetails", mCommandDetails);

        intent.putExtra("ims", false);

        intent.putExtra("errorCode", 41);

        mContext.sendOrderedBroadcast(intent, null, mCatService.mSmsBroadcastReceiver, null,

                SmsManager.RESULT_ERROR_GENERIC_FAILURE, null, null);

        processAllMessages();

        //Verify if the command is encoded with correct Result byte as per TS 101.267

        verify(mSimulatedCommands, atLeastOnce()).sendTerminalResponse(

                eq(mTerminalResponseForNetworkUnableToProcess), any());

    }



    @Test

    public void testSendTerminalResponseForDeliveryFailure() {

        setBroadcastReceiverPendingResult(mCatService.mSmsBroadcastReceiver,

                SmsManager.RESULT_ERROR_GENERIC_FAILURE);

        Intent intent = new Intent(SMS_DELIVERY_ACTION).putExtra("cmdDetails", mCommandDetails);

        mContext.sendOrderedBroadcast(intent, null, mCatService.mSmsBroadcastReceiver, null,

                SmsManager.RESULT_ERROR_GENERIC_FAILURE, null, null);

        processAllMessages();

        //Verify if the command is encoded with correct Result byte as per TS 101.267

        verify(mSimulatedCommands, atLeastOnce()).sendTerminalResponse(

                eq(mTerminalResponseForTerminalUnableToProcess), any());

    }



    @Test

    public void testSendTerminalResponseForDeliverySuccess() {

        setBroadcastReceiverPendingResult(mCatService.mSmsBroadcastReceiver,

                Activity.RESULT_OK);

        Intent intent = new Intent(SMS_DELIVERY_ACTION).putExtra("cmdDetails", mCommandDetails);

        mContext.sendOrderedBroadcast(intent, null, mCatService.mSmsBroadcastReceiver, null,

                Activity.RESULT_OK, null, null);

        processAllMessages();

        //Verify if the command is encoded with correct Result byte as per TS 101.267

        verify(mSimulatedCommands, atLeastOnce()).sendTerminalResponse(

                eq(mTerminalResponseForDeliverySuccess), any());

    }

}