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

Commit 844bb012 authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan
Browse files

Samsung STK: Fix SMS-based STK 

SEND_SMS was falling through to SEND_USSD (which used to do nothing
until USSD support was added) causing an Exception because cmdParams
is not an instance of SendUSSDParams.

Fix by using type-checking instead of checking if Samsung STK is
enabled (because SendSMSParams and SendUSSDParams will only be
created if Samsung STK is enabled.)

Change-Id: I671014e295e9e529aad25a8b6fbd5a2e5788fc44
parent db939b01

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -287,15 +287,15 @@ public class CatService extends Handler implements AppInterface { 
                break;

                break;

            case SEND_DTMF:

            case SEND_DTMF:

            case SEND_SMS:

            case SEND_SMS:

                if (mContext.getResources().

                // Samsung STK

                        getBoolean(com.android.internal.R.bool.config_samsung_stk)) {

                if (cmdParams instanceof SendSMSParams) {

                    handleProactiveCommandSendSMS((SendSMSParams) cmdParams);

                    handleProactiveCommandSendSMS((SendSMSParams) cmdParams);

                }

                }

                // Fall through

                // Fall through

            case SEND_SS:

            case SEND_SS:

            case SEND_USSD:

            case SEND_USSD:

                if (mContext.getResources().

                // Samsung STK

                        getBoolean(com.android.internal.R.bool.config_samsung_stk)) {

                if (cmdParams instanceof SendUSSDParams) {

                    handleProactiveCommandSendUSSD((SendUSSDParams) cmdParams);

                    handleProactiveCommandSendUSSD((SendUSSDParams) cmdParams);

                }

                }