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.
This commit is contained in:
jsh
2009-10-22 11:36:42 -07:00
committed by Android Git Automerger
2 changed files with 2 additions and 1 deletions

View File

@@ -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

View File

@@ -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;
}
}
}