diff options
| author | 2010-04-21 14:43:12 -0700 | |
|---|---|---|
| committer | 2010-04-21 14:43:12 -0700 | |
| commit | 23c0b2eb5a610030ad5afe406987cb09c858ccfb (patch) | |
| tree | e1f7050c3bed1bf330908788ac4b5dc9d34bd190 | |
| parent | 52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a (diff) | |
| parent | 7fb4b8455ccccde4698bed1a1906434a14a611a6 (diff) | |
Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
| -rw-r--r-- | telephony/java/com/android/internal/telephony/CommandException.java | 3 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/RILConstants.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/CommandException.java b/telephony/java/com/android/internal/telephony/CommandException.java index a5d11cf250d8..eb0a440dff25 100644 --- a/telephony/java/com/android/internal/telephony/CommandException.java +++ b/telephony/java/com/android/internal/telephony/CommandException.java @@ -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); diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 4d8c7ec86e87..01f4ab274c13 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -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) */ |