Merge "Revert "Telephony: Add CallFailCause values for clear code" (e382936f) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/gsm/CallFailCause.java

+0 −37

Original line number	Diff line number	Diff line
		@@ -55,42 +55,5 @@ public interface CallFailCause {
		static final int DIAL_MODIFIED_TO_SS = 245;
		static final int DIAL_MODIFIED_TO_DIAL = 246;

		// Supplementary
		static final int NO_ROUTE_TO_DESTINAON = 3;
		static final int CHANNEL_UNACCEPTABLE = 6;
		static final int OPERATOR_DETERMINED_BARRING = 8;
		static final int CALL_FAIL_NO_USER_RESPONDING = 18;
		static final int CALL_FAIL_NO_ANSWER_FROM_USER = 19;
		static final int CALL_REJECTED = 21;
		static final int PREEMPTION = 25;
		static final int CALL_FAIL_DESTINATION_OUT_OF_ORDER = 27;
		static final int INVALID_NUMBER = 28;
		static final int FACILITY_REJECTED = 29;
		static final int NETWORK_OUT_OF_ORDER = 38;
		static final int ACCESS_INFORMATION_DISCARDED = 43;
		static final int RESOURCES_UNAVAILABLE_OR_UNSPECIFIED = 47;
		static final int REQUESTED_FACILITY_NOT_SUBSCRIBED = 50;
		static final int INCOMING_CALLS_BARRED_WITHIN_CUG = 55;
		static final int BEARER_CAPABILITY_NOT_AUTHORIZED = 57;
		static final int SERVICE_OPTION_NOT_AVAILABLE = 63;
		static final int BEARER_SERVICE_NOT_IMPLEMENTED = 65;
		static final int REQUESTED_FACILITY_NOT_IMPLEMENTED = 69;
		static final int ONLY_DIGITAL_INFORMATION_BEARER_AVAILABLE = 70;
		static final int SERVICE_OR_OPTION_NOT_IMPLEMENTED = 79;
		static final int INVALID_TRANSACTION_IDENTIFIER = 81;
		static final int USER_NOT_MEMBER_OF_CUG = 87;
		static final int INCOMPATIBLE_DESTINATION = 88;
		static final int INVALID_TRANSIT_NW_SELECTION = 91;
		static final int SEMANTICALLY_INCORRECT_MESSAGE = 95;
		static final int INVALID_MANDATORY_INFORMATION = 96;
		static final int MESSAGE_TYPE_NON_IMPLEMENTED = 97;
		static final int MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 98;
		static final int INFORMATION_ELEMENT_NON_EXISTENT = 99;
		static final int CONDITIONAL_IE_ERROR = 100;
		static final int MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 101;
		static final int RECOVERY_ON_TIMER_EXPIRED = 102;
		static final int PROTOCOL_ERROR_UNSPECIFIED = 111;
		static final int INTERWORKING_UNSPECIFIED = 127;

		static final int ERROR_UNSPECIFIED = 0xffff;
		}

src/java/com/android/internal/telephony/gsm/GsmConnection.java

+3 −127

Original line number	Diff line number	Diff line
		@@ -307,140 +307,16 @@ public class GsmConnection extends Connection {
		*/

		switch (causeCode) {
		case CallFailCause.NO_ROUTE_TO_DESTINAON:
		return DisconnectCause.NO_ROUTE_TO_DESTINAON;

		case CallFailCause.CHANNEL_UNACCEPTABLE:
		return DisconnectCause.CHANNEL_UNACCEPTABLE;

		case CallFailCause.OPERATOR_DETERMINED_BARRING:
		return DisconnectCause.OPERATOR_DETERMINED_BARRING;

		case CallFailCause.CALL_FAIL_NO_USER_RESPONDING:
		return DisconnectCause.CALL_FAIL_NO_USER_RESPONDING;

		case CallFailCause.CALL_FAIL_NO_ANSWER_FROM_USER:
		return DisconnectCause.CALL_FAIL_NO_ANSWER_FROM_USER;

		case CallFailCause.CALL_REJECTED:
		return DisconnectCause.CALL_REJECTED;

		case CallFailCause.NUMBER_CHANGED:
		return DisconnectCause.NUMBER_CHANGED;

		case CallFailCause.PREEMPTION:
		return DisconnectCause.PREEMPTION;

		case CallFailCause.CALL_FAIL_DESTINATION_OUT_OF_ORDER:
		return DisconnectCause.CALL_FAIL_DESTINATION_OUT_OF_ORDER;

		case CallFailCause.INVALID_NUMBER:
		return DisconnectCause.INVALID_NUMBER;

		case CallFailCause.FACILITY_REJECTED:
		return DisconnectCause.FACILITY_REJECTED;

		case CallFailCause.STATUS_ENQUIRY:
		return DisconnectCause.RESP_TO_STATUS_ENQUIRY;

		case CallFailCause.NORMAL_UNSPECIFIED:
		return DisconnectCause.NORMAL_UNSPECIFIED;
		case CallFailCause.USER_BUSY:
		return DisconnectCause.BUSY;

		case CallFailCause.NO_CIRCUIT_AVAIL:
		return DisconnectCause.NO_CIRCUIT_AVAIL;

		case CallFailCause.NETWORK_OUT_OF_ORDER:
		return DisconnectCause.NETWORK_OUT_OF_ORDER;

		case CallFailCause.TEMPORARY_FAILURE:
		return DisconnectCause.TEMPORARY_FAILURE;

		case CallFailCause.SWITCHING_CONGESTION:
		return DisconnectCause.SWITCHING_EQUIPMENT_CONGESTION;

		case CallFailCause.ACCESS_INFORMATION_DISCARDED:
		return DisconnectCause.ACCESS_INFORMATION_DISCARDED;

		case CallFailCause.CHANNEL_NOT_AVAIL:
		return DisconnectCause.REQUESTED_CIRCUIT_OR_CHANNEL_NOT_AVAILABLE;

		case CallFailCause.RESOURCES_UNAVAILABLE_OR_UNSPECIFIED:
		return DisconnectCause.RESOURCES_UNAVAILABLE_OR_UNSPECIFIED;

		case CallFailCause.QOS_NOT_AVAIL:
		return DisconnectCause.QOS_UNAVAILABLE;

		case CallFailCause.REQUESTED_FACILITY_NOT_SUBSCRIBED:
		return DisconnectCause.REQUESTED_FACILITY_NOT_SUBSCRIBED;

		case CallFailCause.INCOMING_CALLS_BARRED_WITHIN_CUG:
		return DisconnectCause.INCOMING_CALLS_BARRED_WITHIN_CUG;

		case CallFailCause.BEARER_CAPABILITY_NOT_AUTHORIZED:
		return DisconnectCause.BEARER_CAPABILITY_NOT_AUTHORIZED;

		case CallFailCause.BEARER_NOT_AVAIL:
		return DisconnectCause.BEARER_CAPABILITY_UNAVAILABLE;

		case CallFailCause.SERVICE_OPTION_NOT_AVAILABLE:
		return DisconnectCause.SERVICE_OPTION_NOT_AVAILABLE;

		case CallFailCause.BEARER_SERVICE_NOT_IMPLEMENTED:
		return DisconnectCause.BEARER_SERVICE_NOT_IMPLEMENTED;

		case CallFailCause.REQUESTED_FACILITY_NOT_IMPLEMENTED:
		return DisconnectCause.REQUESTED_FACILITY_NOT_IMPLEMENTED;

		case CallFailCause.ONLY_DIGITAL_INFORMATION_BEARER_AVAILABLE:
		return DisconnectCause.ONLY_DIGITAL_INFORMATION_BEARER_AVAILABLE;

		case CallFailCause.SERVICE_OR_OPTION_NOT_IMPLEMENTED:
		return DisconnectCause.SERVICE_OR_OPTION_NOT_IMPLEMENTED;

		case CallFailCause.INVALID_TRANSACTION_IDENTIFIER:
		return DisconnectCause.INVALID_TRANSACTION_IDENTIFIER;

		case CallFailCause.USER_NOT_MEMBER_OF_CUG:
		return DisconnectCause.USER_NOT_MEMBER_OF_CUG;

		case CallFailCause.INCOMPATIBLE_DESTINATION:
		return DisconnectCause.INCOMPATIBLE_DESTINATION;

		case CallFailCause.INVALID_TRANSIT_NW_SELECTION:
		return DisconnectCause.INVALID_TRANSIT_NW_SELECTION;

		case CallFailCause.SEMANTICALLY_INCORRECT_MESSAGE:
		return DisconnectCause.SEMANTICALLY_INCORRECT_MESSAGE;

		case CallFailCause.INVALID_MANDATORY_INFORMATION:
		return DisconnectCause.INVALID_MANDATORY_INFORMATION;

		case CallFailCause.MESSAGE_TYPE_NON_IMPLEMENTED:
		return DisconnectCause.MESSAGE_TYPE_NON_IMPLEMENTED;

		case CallFailCause.MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE:
		return DisconnectCause.MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE;

		case CallFailCause.INFORMATION_ELEMENT_NON_EXISTENT:
		return DisconnectCause.INFORMATION_ELEMENT_NON_EXISTENT;

		case CallFailCause.CONDITIONAL_IE_ERROR:
		return DisconnectCause.CONDITIONAL_IE_ERROR;

		case CallFailCause.MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE:
		return DisconnectCause.MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE;

		case CallFailCause.RECOVERY_ON_TIMER_EXPIRED:
		return DisconnectCause.RECOVERY_ON_TIMER_EXPIRED;

		case CallFailCause.PROTOCOL_ERROR_UNSPECIFIED:
		return DisconnectCause.PROTOCOL_ERROR_UNSPECIFIED;

		case CallFailCause.INTERWORKING_UNSPECIFIED:
		return DisconnectCause.INTERWORKING_UNSPECIFIED;

		case CallFailCause.USER_BUSY:
		return DisconnectCause.BUSY;
		return DisconnectCause.CONGESTION;

		case CallFailCause.ACM_LIMIT_EXCEEDED:
		return DisconnectCause.LIMIT_EXCEEDED;