summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJüri Schultz <jyri@schultz.ee>2012-12-01 15:20:51 +0700
committerChirayu Desai <cdesai@cyanogenmod.org>2012-12-06 16:32:08 +0530
commita5e26a6093ff50d3d84f54d8ce477517d051c575 (patch)
treeb1e63f5bab223f93862181cd3375b5121277c90d
parentea28c5a080b84f2c8673592d72afc75110e94dfd (diff)
downloadframeworks_base-a5e26a6093ff50d3d84f54d8ce477517d051c575.zip
frameworks_base-a5e26a6093ff50d3d84f54d8ce477517d051c575.tar.gz
frameworks_base-a5e26a6093ff50d3d84f54d8ce477517d051c575.tar.bz2
Samsung STK support
Change-Id: I08d169bc466df290fca838b09f6b0fbea2ac82a8
-rwxr-xr-xcore/res/res/values/config.xml3
-rw-r--r--core/res/res/values/symbols.xml1
-rw-r--r--telephony/java/com/android/internal/telephony/RILConstants.java1
3 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index e2e8627..0c8a5b2 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1051,4 +1051,7 @@
<!-- Setting to false will disable CM's IME switcher implementation for tablets -->
<bool name="config_show_cmIMESwitcher">true</bool>
+ <!-- Boolean to enable stk functionality on Samsung phones -->
+ <bool name="config_samsung_stk">false</bool>
+
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 445b032..e474a2d 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1827,6 +1827,7 @@
<java-symbol type="integer" name="config_backKillTimeout" />
<java-symbol type="bool" name="config_show_cmIMESwitcher"/>
<java-symbol type="bool" name="config_smsSamsungCdmaAlternateMessageIDEncoding" />
+ <java-symbol type="bool" name="config_samsung_stk" />
<!-- Notification and battery light -->
<java-symbol type="bool" name="config_intrusiveBatteryLed" />
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 077ad68..d93da8f 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -297,4 +297,5 @@ cat include/telephony/ril.h | \
int RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE = 1033;
int RIL_UNSOL_RIL_CONNECTED = 1034;
int RIL_UNSOL_VOICE_RADIO_TECH_CHANGED = 1035;
+ int RIL_UNSOL_STK_SEND_SMS_RESULT = 11002; /* Samsung STK */
}