From 3ff560d7ba9fcedc4d388f63b756108a715266f4 Mon Sep 17 00:00:00 2001 From: jsh Date: Wed, 21 Oct 2009 17:55:31 -0700 Subject: [PATCH] Send "encoding problem" to the network for general errors during SMS dispatch. Previously we were returning "other terminal problem" to the network, but this had the potential of blocking MT SMS messages for days at a time (eg, if the problematic message is resent). Sending the "encoding problem" cause code is reasonable since in most cases the we have encountered an error while trying to parse the message. Addresses b/2200412. --- .../java/com/android/internal/telephony/CommandsInterface.java | 1 + .../com/android/internal/telephony/cdma/CdmaSMSDispatcher.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/telephony/java/com/android/internal/telephony/CommandsInterface.java b/telephony/java/com/android/internal/telephony/CommandsInterface.java index 5777cad08ad65..1d9f10a96e03a 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 d895cd44956a7..c16b04d08b50b 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; } } }