diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2012-12-09 03:28:35 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-12-09 03:28:35 -0800 |
| commit | 6cb6a6af002d0c5a7ac84fc76c466f54d484c546 (patch) | |
| tree | 44fc4ff593276b9f3c36f33d0d9df084e2c70a4f | |
| parent | 36698b47e5396e4389636714ab6c09bdbe014d10 (diff) | |
| parent | a5e26a6093ff50d3d84f54d8ce477517d051c575 (diff) | |
| download | frameworks_base-6cb6a6af002d0c5a7ac84fc76c466f54d484c546.zip frameworks_base-6cb6a6af002d0c5a7ac84fc76c466f54d484c546.tar.gz frameworks_base-6cb6a6af002d0c5a7ac84fc76c466f54d484c546.tar.bz2 | |
Merge "Samsung STK support" into mr1-staging
| -rwxr-xr-x | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/RILConstants.java | 1 |
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 */ } |