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

Commit 23c0b2eb authored by John Wang's avatar John Wang Committed by Android (Google) Code Review
Browse files

Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo

parents 52e70b25 7fb4b845

telephony/java/com/android/internal/telephony/CommandException.java

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class CommandException extends RuntimeException { 
        OP_NOT_ALLOWED_DURING_VOICE_CALL,

        OP_NOT_ALLOWED_BEFORE_REG_NW,

        SMS_FAIL_RETRY,

        ILLEGAL_SIM_OR_ME,

    }



    public CommandException(Error e) {
@@ -68,6 +69,8 @@ public class CommandException extends RuntimeException { 
                return new CommandException(Error.OP_NOT_ALLOWED_BEFORE_REG_NW);

            case RILConstants.SMS_SEND_FAIL_RETRY:

                return new CommandException(Error.SMS_FAIL_RETRY);

            case RILConstants.ILLEGAL_SIM_OR_ME:

                return new CommandException(Error.ILLEGAL_SIM_OR_ME);

            default:

                Log.e("GSM", "Unrecognized RIL errno " + ril_errno);

                return new CommandException(Error.INVALID_RESPONSE);

telephony/java/com/android/internal/telephony/RILConstants.java

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ public interface RILConstants { 
    int OP_NOT_ALLOWED_BEFORE_REG_NW = 9;     /* request is not allowed before device registers to

                                                 network */

    int SMS_SEND_FAIL_RETRY = 10;             /* send sms fail and need retry */

    int ILLEGAL_SIM_OR_ME = 15;               /* network selection failure due

                                                 to wrong SIM/ME and no

                                                 retries needed */



    /* NETWORK_MODE_* See ril.h RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE */

    int NETWORK_MODE_WCDMA_PREF     = 0; /* GSM/WCDMA (WCDMA preferred) */