diff options
| author | jsh <jsh@google.com> | 2009-10-22 11:16:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-22 11:16:35 -0700 |
| commit | f214dd9d4f9f5f923a77aa91cd8cf3efa5bc3765 (patch) | |
| tree | 572f37397ce0d7290a288824b31e2604990d5ffd /telephony | |
| parent | 3d4247ef9541afc88af5ac8d4634f331b20ed5cb (diff) | |
| parent | f14da417f3cb1f80a62732238623bb83173255c0 (diff) | |
| download | frameworks_base-f214dd9d4f9f5f923a77aa91cd8cf3efa5bc3765.zip frameworks_base-f214dd9d4f9f5f923a77aa91cd8cf3efa5bc3765.tar.gz frameworks_base-f214dd9d4f9f5f923a77aa91cd8cf3efa5bc3765.tar.bz2 | |
am f14da417: Merge change I3ff560d7 into eclair
Merge commit 'f14da417f3cb1f80a62732238623bb83173255c0' into eclair-mr2
* commit 'f14da417f3cb1f80a62732238623bb83173255c0':
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; } } } |