diff options
| author | jsh <jsh@google.com> | 2009-10-22 11:36:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-22 11:36:42 -0700 |
| commit | 3751dbbe40923ebbe02314cfd75aba944afc4fcb (patch) | |
| tree | 8a1d4cc64258912def58a10933e1fafc3b39e1a7 /telephony | |
| parent | dee99abcfcf624efc23ec7a81c5a66a6cce4073b (diff) | |
| parent | 10d97d27808abe6b89caae3cee8383bb3514ad08 (diff) | |
| download | frameworks_base-3751dbbe40923ebbe02314cfd75aba944afc4fcb.zip frameworks_base-3751dbbe40923ebbe02314cfd75aba944afc4fcb.tar.gz frameworks_base-3751dbbe40923ebbe02314cfd75aba944afc4fcb.tar.bz2 | |
am 10d97d27: am f214dd9d: am f14da417: Merge change I3ff560d7 into eclair
Merge commit '10d97d27808abe6b89caae3cee8383bb3514ad08'
* commit '10d97d27808abe6b89caae3cee8383bb3514ad08':
Send "encoding problem" to the network for general errors during SMS dispatch.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/CommandsInterface.java | 1 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/CommandsInterface.java b/telephony/java/com/android/internal/telephony/CommandsInterface.java index 5777cad..1d9f10a 100644 --- a/telephony/java/com/android/internal/telephony/CommandsInterface.java +++ b/telephony/java/com/android/internal/telephony/CommandsInterface.java @@ -148,6 +148,7 @@ public interface CommandsInterface { static final int CDMA_SMS_FAIL_CAUSE_INVALID_TELESERVICE_ID = 4; static final int CDMA_SMS_FAIL_CAUSE_RESOURCE_SHORTAGE = 35; static final int CDMA_SMS_FAIL_CAUSE_OTHER_TERMINAL_PROBLEM = 39; + static final int CDMA_SMS_FAIL_CAUSE_ENCODING_PROBLEM = 96; //***** Methods diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java b/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java index d895cd4..c16b04d 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java @@ -481,7 +481,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { return CommandsInterface.CDMA_SMS_FAIL_CAUSE_INVALID_TELESERVICE_ID; case Intents.RESULT_SMS_GENERIC_ERROR: default: - return CommandsInterface.CDMA_SMS_FAIL_CAUSE_OTHER_TERMINAL_PROBLEM; + return CommandsInterface.CDMA_SMS_FAIL_CAUSE_ENCODING_PROBLEM; } } } |