From 83435d7cfb0b1a1aea447f65938b0504783e234e Mon Sep 17 00:00:00 2001 From: Suresh Kumar Sugguna Date: Tue, 12 May 2015 22:45:25 +0530 Subject: IMS: During CS retry, propagate reason code to UI When an IMS call is retried over CS, propagate the cause code to upper layers. Change-Id: I1f4740e872f646082578aa8957fdb1c36c3256b2 CRs-Fixed: 797564 Conflicts: telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl --- telephony/java/com/android/ims/ImsReasonInfo.java | 18 ++++++++++++++---- .../android/ims/internal/IImsCallSessionListener.aidl | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/telephony/java/com/android/ims/ImsReasonInfo.java b/telephony/java/com/android/ims/ImsReasonInfo.java index ec047aa0783..2798de29e55 100644 --- a/telephony/java/com/android/ims/ImsReasonInfo.java +++ b/telephony/java/com/android/ims/ImsReasonInfo.java @@ -169,14 +169,24 @@ public class ImsReasonInfo implements Parcelable { // Others public static final int CODE_SIP_CLIENT_ERROR = 342; // 5xx responses - // 501 : Server Internal Error + // 500 : Server Internal Error public static final int CODE_SIP_SERVER_INTERNAL_ERROR = 351; + // 501 : no support for the request + public static final int CODE_SIP_SERVER_NOT_IMPLEMENTED = 352; + // 502 : Bad Gateway + public static final int CODE_SIP_SERVER_BAD_GATEWAY = 353; // 503 : Service Unavailable - public static final int CODE_SIP_SERVICE_UNAVAILABLE = 352; + public static final int CODE_SIP_SERVICE_UNAVAILABLE = 354; // 504 : Server Time-out - public static final int CODE_SIP_SERVER_TIMEOUT = 353; + public static final int CODE_SIP_SERVER_TIMEOUT = 355; + // 505 : version not supported + public static final int CODE_SIP_SERVER_VERSION_UNSUPPORTED = 356; + // 513 : Message too large + public static final int CODE_SIP_SERVER_MESSAGE_TOOLARGE = 357; + // 580 : pre-condition failure + public static final int CODE_SIP_SERVER_PRECONDITION_FAILURE = 358; // Others - public static final int CODE_SIP_SERVER_ERROR = 354; + public static final int CODE_SIP_SERVER_ERROR = 359; // 6xx responses // 603 : Decline public static final int CODE_SIP_USER_REJECTED = 361; diff --git a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl index 792ecbfd4ed..99e71595eba 100644 --- a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl @@ -128,4 +128,21 @@ interface IImsCallSessionListener { */ void callSessionSuppServiceReceived(in IImsCallSession session, in ImsSuppServiceNotification suppSrvNotification); + + /** + * Notifies the retry error information for the current session. + * @param reasonInfo.mcode is a one of the following: + * - {@link com.android.ims.ImsReasonInfo#CODE_SIP_FORBIDDEN} + * - {@link com.android.ims.ImsReasonInfo#CODE_SIP_REQUEST_TIMEOUT} + * - {@link com.android.ims.ImsReasonInfo#CODE_SIP_TEMPRARILY_UNAVAILABLE} + * - {@link com.android.ims.ImsReasonInfo#CODE_SIP_SERVER_INTERNAL_ERROR} + * - {@link com.android.ims.ImsReasonInfo#CODE_SIP_SERVER_NOT_IMPLEMENTED} + * - {@link com.android.ims.ImsReasonInfo#CODE_SIP_SERVER_BAD_GATEWAY} + * - {@link com.android.ims.ImsReasonInfo#CODE_SIP_SERVICE_UNAVAILABLE} + * - {@link com.android.ims.ImsReasonInfo#CODE_SIP_SERVER_VERSION_UNSUPPORTED} + * - {@link com.android.ims.ImsReasonInfo#CODE_SIP_SERVER_MESSAGE_TOOLARGE} + * - {@link com.android.ims.ImsReasonInfo#CODE_SIP_SERVER_PRECONDITION_FAILURE} + */ + void callSessionRetryErrorReceived(in IImsCallSession session, + in ImsReasonInfo reasonInfo); } -- cgit v1.2.3