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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/java/com/android/internal/telephony/cat/CatService.java b/src/java/com/android/internal/telephony/cat/CatService.java
index 156c977..8ae5fea 100644
--- a/src/java/com/android/internal/telephony/cat/CatService.java
+++ b/src/java/com/android/internal/telephony/cat/CatService.java
@@ -287,15 +287,15 @@ public class CatService extends Handler implements AppInterface {
                 break;
             case SEND_DTMF:
             case SEND_SMS:
-                if (mContext.getResources().
-                        getBoolean(com.android.internal.R.bool.config_samsung_stk)) {
+                // Samsung STK
+                if (cmdParams instanceof SendSMSParams) {
                     handleProactiveCommandSendSMS((SendSMSParams) cmdParams);
                 }
                 // Fall through
             case SEND_SS:
             case SEND_USSD:
-                if (mContext.getResources().
-                        getBoolean(com.android.internal.R.bool.config_samsung_stk)) {
+                // Samsung STK
+                if (cmdParams instanceof SendUSSDParams) {
                     handleProactiveCommandSendUSSD((SendUSSDParams) cmdParams);
                 }