Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo

Browse Source 
Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp

* commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb':
  Add ILLEGAL_SIM_OR_ME error code.
This commit is contained in:
John Wang
2010-04-21 14:46:06 -07:00
committed by Android Git Automerger
parent 46fba3b9e1 23c0b2eb5a
commit f77fff4b4e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/com/android/internal/telephony/CommandException.java
View File

@@ -37,6 +37,7 @@ public class CommandException extends RuntimeException {
OP_NOT_ALLOWED_DURING_VOICE_CALL, OP_NOT_ALLOWED_DURING_VOICE_CALL,
OP_NOT_ALLOWED_BEFORE_REG_NW, OP_NOT_ALLOWED_BEFORE_REG_NW,
SMS_FAIL_RETRY, SMS_FAIL_RETRY,
ILLEGAL_SIM_OR_ME,
} }
public CommandException(Error e) { public CommandException(Error e) {
@@ -68,6 +69,8 @@ public class CommandException extends RuntimeException {
return new CommandException(Error.OP_NOT_ALLOWED_BEFORE_REG_NW); return new CommandException(Error.OP_NOT_ALLOWED_BEFORE_REG_NW);
case RILConstants.SMS_SEND_FAIL_RETRY: case RILConstants.SMS_SEND_FAIL_RETRY:
return new CommandException(Error.SMS_FAIL_RETRY); return new CommandException(Error.SMS_FAIL_RETRY);
case RILConstants.ILLEGAL_SIM_OR_ME:
return new CommandException(Error.ILLEGAL_SIM_OR_ME);
default: default:
Log.e("GSM", "Unrecognized RIL errno " + ril_errno); Log.e("GSM", "Unrecognized RIL errno " + ril_errno);
return new CommandException(Error.INVALID_RESPONSE); return new CommandException(Error.INVALID_RESPONSE);

3
telephony/java/com/android/internal/telephony/RILConstants.java
View File

@@ -45,6 +45,9 @@ public interface RILConstants {
int OP_NOT_ALLOWED_BEFORE_REG_NW = 9; /* request is not allowed before device registers to int OP_NOT_ALLOWED_BEFORE_REG_NW = 9; /* request is not allowed before device registers to
network */ network */
int SMS_SEND_FAIL_RETRY = 10; /* send sms fail and need retry */ 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 */ /* NETWORK_MODE_* See ril.h RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE */
int NETWORK_MODE_WCDMA_PREF = 0; /* GSM/WCDMA (WCDMA preferred) */ int NETWORK_MODE_WCDMA_PREF = 0; /* GSM/WCDMA (WCDMA preferred) */