Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f214dd9d authored by jsh's avatar jsh Committed by Android Git Automerger
Browse files

am f14da417: Merge change I3ff560d7 into eclair 

Merge commit 'f14da417' into eclair-mr2

* commit 'f14da417':
  Send "encoding problem" to the network for general errors during SMS dispatch.
parents 3d4247ef f14da417

telephony/java/com/android/internal/telephony/CommandsInterface.java

+1 −0
Original line number Diff line number Diff line
@@ -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

telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

    }

}