Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8dad020 authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "Propagation of additional Ims Call Fail Causes" am: 97ee6295 

am: 9834928c

Change-Id: Ie3d7b237e3d7cfe2c53498807ff18bdbbfae61e9
parents ccc7473f 9834928c

api/system-current.txt

+16 −0
Original line number Diff line number Diff line
@@ -5881,6 +5881,7 @@ package android.telephony.ims { 
    field public static final int CODE_RADIO_SETUP_FAILURE = 1509; // 0x5e5

    field public static final int CODE_RADIO_UPLINK_FAILURE = 1508; // 0x5e4

    field public static final int CODE_REGISTRATION_ERROR = 1000; // 0x3e8

    field public static final int CODE_REJECTED_ELSEWHERE = 1017; // 0x3f9

    field public static final int CODE_REJECT_1X_COLLISION = 1603; // 0x643

    field public static final int CODE_REJECT_CALL_ON_OTHER_SUB = 1602; // 0x642

    field public static final int CODE_REJECT_CALL_TYPE_NOT_ALLOWED = 1605; // 0x645
@@ -5904,26 +5905,39 @@ package android.telephony.ims { 
    field public static final int CODE_REJECT_VT_AVPF_NOT_ALLOWED = 1619; // 0x653

    field public static final int CODE_REJECT_VT_TTY_NOT_ALLOWED = 1615; // 0x64f

    field public static final int CODE_REMOTE_CALL_DECLINE = 1404; // 0x57c

    field public static final int CODE_SESSION_MODIFICATION_FAILED = 1517; // 0x5ed

    field public static final int CODE_SIP_ALTERNATE_EMERGENCY_CALL = 1514; // 0x5ea

    field public static final int CODE_SIP_AMBIGUOUS = 376; // 0x178

    field public static final int CODE_SIP_BAD_ADDRESS = 337; // 0x151

    field public static final int CODE_SIP_BAD_REQUEST = 331; // 0x14b

    field public static final int CODE_SIP_BUSY = 338; // 0x152

    field public static final int CODE_SIP_CALL_OR_TRANS_DOES_NOT_EXIST = 372; // 0x174

    field public static final int CODE_SIP_CLIENT_ERROR = 342; // 0x156

    field public static final int CODE_SIP_EXTENSION_REQUIRED = 370; // 0x172

    field public static final int CODE_SIP_FORBIDDEN = 332; // 0x14c

    field public static final int CODE_SIP_GLOBAL_ERROR = 362; // 0x16a

    field public static final int CODE_SIP_INTERVAL_TOO_BRIEF = 371; // 0x173

    field public static final int CODE_SIP_LOOP_DETECTED = 373; // 0x175

    field public static final int CODE_SIP_METHOD_NOT_ALLOWED = 366; // 0x16e

    field public static final int CODE_SIP_NOT_ACCEPTABLE = 340; // 0x154

    field public static final int CODE_SIP_NOT_FOUND = 333; // 0x14d

    field public static final int CODE_SIP_NOT_REACHABLE = 341; // 0x155

    field public static final int CODE_SIP_NOT_SUPPORTED = 334; // 0x14e

    field public static final int CODE_SIP_PROXY_AUTHENTICATION_REQUIRED = 367; // 0x16f

    field public static final int CODE_SIP_REDIRECTED = 321; // 0x141

    field public static final int CODE_SIP_REQUEST_CANCELLED = 339; // 0x153

    field public static final int CODE_SIP_REQUEST_ENTITY_TOO_LARGE = 368; // 0x170

    field public static final int CODE_SIP_REQUEST_PENDING = 377; // 0x179

    field public static final int CODE_SIP_REQUEST_TIMEOUT = 335; // 0x14f

    field public static final int CODE_SIP_REQUEST_URI_TOO_LARGE = 369; // 0x171

    field public static final int CODE_SIP_SERVER_ERROR = 354; // 0x162

    field public static final int CODE_SIP_SERVER_INTERNAL_ERROR = 351; // 0x15f

    field public static final int CODE_SIP_SERVER_TIMEOUT = 353; // 0x161

    field public static final int CODE_SIP_SERVICE_UNAVAILABLE = 352; // 0x160

    field public static final int CODE_SIP_TEMPRARILY_UNAVAILABLE = 336; // 0x150

    field public static final int CODE_SIP_TRANSACTION_DOES_NOT_EXIST = 343; // 0x157

    field public static final int CODE_SIP_TOO_MANY_HOPS = 374; // 0x176

    field public static final int CODE_SIP_UNDECIPHERABLE = 378; // 0x17a

    field public static final int CODE_SIP_USER_MARKED_UNWANTED = 365; // 0x16d

    field public static final int CODE_SIP_USER_REJECTED = 361; // 0x169

    field public static final int CODE_SUPP_SVC_CANCELLED = 1202; // 0x4b2
@@ -5933,9 +5947,11 @@ package android.telephony.ims { 
    field public static final int CODE_TIMEOUT_NO_ANSWER = 202; // 0xca

    field public static final int CODE_TIMEOUT_NO_ANSWER_CALL_UPDATE = 203; // 0xcb

    field public static final int CODE_UNSPECIFIED = 0; // 0x0

    field public static final int CODE_USER_CANCELLED_SESSION_MODIFICATION = 512; // 0x200

    field public static final int CODE_USER_DECLINE = 504; // 0x1f8

    field public static final int CODE_USER_IGNORE = 503; // 0x1f7

    field public static final int CODE_USER_NOANSWER = 502; // 0x1f6

    field public static final int CODE_USER_REJECTED_SESSION_MODIFICATION = 511; // 0x1ff

    field public static final int CODE_USER_TERMINATED = 501; // 0x1f5

    field public static final int CODE_USER_TERMINATED_BY_REMOTE = 510; // 0x1fe

    field public static final int CODE_UT_CB_PASSWORD_MISMATCH = 821; // 0x335

telephony/java/android/telephony/ims/ImsReasonInfo.java

+102 −1
Original line number Diff line number Diff line
@@ -331,7 +331,80 @@ public final class ImsReasonInfo implements Parcelable { 
     */

    public static final int CODE_SIP_USER_MARKED_UNWANTED = 365;



    /*

    /**

     * SIP Response : 405

     * Method not allowed for the address in the Request URI

     */

    public static final int CODE_SIP_METHOD_NOT_ALLOWED = 366;



    /**

     * SIP Response : 407

     * The request requires user authentication

     */

    public static final int CODE_SIP_PROXY_AUTHENTICATION_REQUIRED = 367;



    /**

     * SIP Response : 413

     * Request body too large

     */

    public static final int CODE_SIP_REQUEST_ENTITY_TOO_LARGE = 368;



    /**

     * SIP Response : 414

     * Request-URI too large

     */

    public static final int CODE_SIP_REQUEST_URI_TOO_LARGE = 369;



    /**

     * SIP Response : 421

     * Specific extension is required, which is not present in the HEADER

     */

    public static final int CODE_SIP_EXTENSION_REQUIRED = 370;



    /**

     * SIP Response : 422

     * The session expiration field too small

     */

    public static final int CODE_SIP_INTERVAL_TOO_BRIEF = 371;



    /**

     * SIP Response : 481

     * Request received by the server does not match any dialog or transaction

     */

    public static final int CODE_SIP_CALL_OR_TRANS_DOES_NOT_EXIST = 372;



    /**

     * SIP Response : 482

     * Server has detected a loop

     */

    public static final int CODE_SIP_LOOP_DETECTED = 373;



    /**

     * SIP Response : 483

     * Max-Forwards value reached

     */

    public static final int CODE_SIP_TOO_MANY_HOPS = 374;



    /**

     * SIP Response : 485

     * Request-URI is ambiguous

     *

     */

    public static final int CODE_SIP_AMBIGUOUS = 376;



    /**

     * SIP Response : 491

     * Server has pending request for same dialog

     */

    public static final int CODE_SIP_REQUEST_PENDING = 377;



    /**

     * SIP Response : 493

     * The request cannot be decrypted by recipient

     */

    public static final int CODE_SIP_UNDECIPHERABLE = 378;



    /**

     * MEDIA (IMS -> Telephony)

     */

    /**
@@ -384,6 +457,24 @@ public final class ImsReasonInfo implements Parcelable { 
     * The call has been terminated by the network or remote user.

     */

    public static final int CODE_USER_TERMINATED_BY_REMOTE = 510;

    /**

    * Upgrade Downgrade request rejected by

    * Remote user if the request is MO initiated

    * Local user if the request is MT initiated

    */

    public static final int CODE_USER_REJECTED_SESSION_MODIFICATION = 511;



    /**

    * Upgrade Downgrade request cacncelled by the user who initiated it

    */

    public static final int CODE_USER_CANCELLED_SESSION_MODIFICATION = 512;



    /**

     * UPGRADE DOWNGRADE operation failed

     * This can happen due to failure from SIP/RTP/SDP generation or a Call end is

     * triggered/received while Reinvite is in progress.

     */

    public static final int CODE_SESSION_MODIFICATION_FAILED = 1517;



    /*

     * UT
@@ -483,6 +574,16 @@ public final class ImsReasonInfo implements Parcelable { 
     */

    public static final int CODE_CALL_DROP_IWLAN_TO_LTE_UNAVAILABLE = 1100;



    /**

     * For MultiEndPoint - Call was rejected elsewhere

     */

    public static final int CODE_REJECTED_ELSEWHERE = 1017;



    /**

     * Supplementary services (HOLD/RESUME) failure error codes.

     * Values for Supplemetary services failure - Failed, Cancelled and Re-Invite collision.

     */



    /**

     * Supplementary Services (HOLD/RESUME) - the command failed.

     */