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

Merge change I27d074e0 into eclair

Browse Source 
* changes:
  Telephony: Add a failure cause for CDMA call failures and rename RIL_REQUEST_CDMA_VALIDATE_AKEY to RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY
This commit is contained in:
Android (Google) Code Review
2009-09-29 18:47:17 -04:00
parent 987477159f 27d074e0ef
commit 6189fd98c0
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
telephony/java/com/android/internal/telephony/Connection.java
View File

@@ -59,6 +59,7 @@ public abstract class Connection {
CDMA_ACCESS_FAILURE, CDMA_ACCESS_FAILURE,
CDMA_PREEMPTED, CDMA_PREEMPTED,
CDMA_NOT_EMERGENCY, /* not an emergency call */ CDMA_NOT_EMERGENCY, /* not an emergency call */
CDMA_ACCESS_BLOCKED, /* Access Blocked by CDMA network */
ERROR_UNSPECIFIED ERROR_UNSPECIFIED
} }

4
telephony/java/com/android/internal/telephony/RIL.java
View File

@@ -2174,7 +2174,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
case RIL_REQUEST_CDMA_GET_BROADCAST_CONFIG: ret = responseCdmaBroadcastConfig(p); break; case RIL_REQUEST_CDMA_GET_BROADCAST_CONFIG: ret = responseCdmaBroadcastConfig(p); break;
case RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG: ret = responseVoid(p); break; case RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG: ret = responseVoid(p); break;
case RIL_REQUEST_CDMA_BROADCAST_ACTIVATION: ret = responseVoid(p); break; case RIL_REQUEST_CDMA_BROADCAST_ACTIVATION: ret = responseVoid(p); break;
case RIL_REQUEST_CDMA_VALIDATE_AKEY: ret = responseVoid(p); break; case RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY: ret = responseVoid(p); break;
case RIL_REQUEST_CDMA_SUBSCRIPTION: ret = responseStrings(p); break; case RIL_REQUEST_CDMA_SUBSCRIPTION: ret = responseStrings(p); break;
case RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM: ret = responseInts(p); break; case RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM: ret = responseInts(p); break;
case RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM: ret = responseVoid(p); break; case RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM: ret = responseVoid(p); break;
@@ -3197,7 +3197,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
case RIL_REQUEST_CDMA_GET_BROADCAST_CONFIG: return "RIL_REQUEST_CDMA_GET_BROADCAST_CONFIG"; case RIL_REQUEST_CDMA_GET_BROADCAST_CONFIG: return "RIL_REQUEST_CDMA_GET_BROADCAST_CONFIG";
case RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG: return "RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG"; case RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG: return "RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG";
case RIL_REQUEST_GSM_BROADCAST_ACTIVATION: return "RIL_REQUEST_GSM_BROADCAST_ACTIVATION"; case RIL_REQUEST_GSM_BROADCAST_ACTIVATION: return "RIL_REQUEST_GSM_BROADCAST_ACTIVATION";
case RIL_REQUEST_CDMA_VALIDATE_AKEY: return "RIL_REQUEST_CDMA_VALIDATE_AKEY"; case RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY: return "RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY";
case RIL_REQUEST_CDMA_BROADCAST_ACTIVATION: return "RIL_REQUEST_CDMA_BROADCAST_ACTIVATION"; case RIL_REQUEST_CDMA_BROADCAST_ACTIVATION: return "RIL_REQUEST_CDMA_BROADCAST_ACTIVATION";
case RIL_REQUEST_CDMA_SUBSCRIPTION: return "RIL_REQUEST_CDMA_SUBSCRIPTION"; case RIL_REQUEST_CDMA_SUBSCRIPTION: return "RIL_REQUEST_CDMA_SUBSCRIPTION";
case RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM: return "RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM"; case RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM: return "RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM";

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

@@ -210,7 +210,7 @@ cat include/telephony/ril.h | \
int RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE = 83; int RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE = 83;
int RIL_REQUEST_CDMA_FLASH = 84; int RIL_REQUEST_CDMA_FLASH = 84;
int RIL_REQUEST_CDMA_BURST_DTMF = 85; int RIL_REQUEST_CDMA_BURST_DTMF = 85;
int RIL_REQUEST_CDMA_VALIDATE_AKEY = 86; int RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY = 86;
int RIL_REQUEST_CDMA_SEND_SMS = 87; int RIL_REQUEST_CDMA_SEND_SMS = 87;
int RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE = 88; int RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE = 88;
int RIL_REQUEST_GSM_GET_BROADCAST_CONFIG = 89; int RIL_REQUEST_GSM_GET_BROADCAST_CONFIG = 89;

10
telephony/java/com/android/internal/telephony/cdma/CallFailCause.java
View File

@@ -17,9 +17,10 @@
package com.android.internal.telephony.cdma; package com.android.internal.telephony.cdma;
/** /**
* Call fail causes from TS 24.008 . * CDMA Call fail causes covering all the possible failures that are
* These are mostly the cause codes we need to distinguish for the UI. * needed to be distinguished by the UI. CDMA call failure reasons
* See 22.001 Annex F.4 for mapping of cause codes to local tones. * are derived from the possible call failure scenarios described
* in "CDMA IS2000 - Release A (C.S0005-A v6.0)" standard.
* *
* {@hide} * {@hide}
* *
@@ -51,5 +52,8 @@ public interface CallFailCause {
// For non-emergency number dialed while in emergency callback mode. // For non-emergency number dialed while in emergency callback mode.
static final int CDMA_NOT_EMERGENCY = 1008; static final int CDMA_NOT_EMERGENCY = 1008;
// Access Blocked by CDMA Network.
static final int CDMA_ACCESS_BLOCKED = 1009;
static final int ERROR_UNSPECIFIED = 0xffff; static final int ERROR_UNSPECIFIED = 0xffff;
} }

2
telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java
View File

@@ -418,6 +418,8 @@ public class CdmaConnection extends Connection {
return DisconnectCause.CDMA_PREEMPTED; return DisconnectCause.CDMA_PREEMPTED;
case CallFailCause.CDMA_NOT_EMERGENCY: case CallFailCause.CDMA_NOT_EMERGENCY:
return DisconnectCause.CDMA_NOT_EMERGENCY; return DisconnectCause.CDMA_NOT_EMERGENCY;
case CallFailCause.CDMA_ACCESS_BLOCKED:
return DisconnectCause.CDMA_ACCESS_BLOCKED;
case CallFailCause.ERROR_UNSPECIFIED: case CallFailCause.ERROR_UNSPECIFIED:
case CallFailCause.NORMAL_CLEARING: case CallFailCause.NORMAL_CLEARING:
default: default: