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

Commit 6c4aac0b authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Partner Code Review
Browse files

Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev

parents 02033f80 66742f21

telephony/java/com/android/ims/ImsCallForwardInfo.java

+7 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ public class ImsCallForwardInfo implements Parcelable { 
    public int mStatus;

    // 0x91: International, 0x81: Unknown

    public int mToA;

    // Service class

    public int mServiceClass;

    // Number (it will not include the "sip" or "tel" URI scheme)

    public String mNumber;

    // No reply timer for CF
@@ -55,13 +57,16 @@ public class ImsCallForwardInfo implements Parcelable { 
        out.writeInt(mToA);

        out.writeString(mNumber);

        out.writeInt(mTimeSeconds);

        out.writeInt(mServiceClass);

    }



    @Override

    public String toString() {

        return super.toString() + ", Condition: " + mCondition

            + ", Status: " + ((mStatus == 0) ? "disabled" : "enabled")

            + ", ToA: " + mToA + ", Number=" + mNumber

            + ", ToA: " + mToA

            + ", Service Class: " + mServiceClass

            + ", Number=" + mNumber

            + ", Time (seconds): " + mTimeSeconds;

    }
@@ -71,6 +76,7 @@ public class ImsCallForwardInfo implements Parcelable { 
        mToA = in.readInt();

        mNumber = in.readString();

        mTimeSeconds = in.readInt();

        mServiceClass = in.readInt();

    }



    public static final Creator<ImsCallForwardInfo> CREATOR =

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

+13 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ public class ImsReasonInfo implements Parcelable { 
    public static final int CODE_LOCAL_CALL_VOLTE_RETRY_REQUIRED = 147;

    // IMS call is already terminated (in TERMINATED state)

    public static final int CODE_LOCAL_CALL_TERMINATED = 148;

    // Handover not feasible

    public static final int CODE_LOCAL_HO_NOT_FEASIBLE = 149;



    /**

     * TIMEOUT (IMS -> Telephony)
@@ -153,6 +155,9 @@ public class ImsReasonInfo implements Parcelable { 
    public static final int CODE_SIP_USER_REJECTED = 361;

    // Others

    public static final int CODE_SIP_GLOBAL_ERROR = 362;

    // Emergency failure

    public static final int CODE_EMERGENCY_TEMP_FAILURE = 363;

    public static final int CODE_EMERGENCY_PERM_FAILURE = 364;



    /**

     * MEDIA (IMS -> Telephony)
@@ -235,6 +240,14 @@ public class ImsReasonInfo implements Parcelable { 
     */

    public static final int CODE_ANSWERED_ELSEWHERE = 1014;



    /**

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

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

     */

    public static final int CODE_SUPP_SVC_FAILED = 1201;

    public static final int CODE_SUPP_SVC_CANCELLED = 1202;

    public static final int CODE_SUPP_SVC_REINVITE_COLLISION = 1203;



    /**

     * Network string error messages.

     * mExtraMessage may have these values.

telephony/java/com/android/ims/ImsStreamMediaProfile.java

+10 −0
Original line number Diff line number Diff line
@@ -51,6 +51,16 @@ public class ImsStreamMediaProfile implements Parcelable { 
    public static final int AUDIO_QUALITY_GSM_EFR = 8;

    public static final int AUDIO_QUALITY_GSM_FR = 9;

    public static final int AUDIO_QUALITY_GSM_HR = 10;

    public static final int AUDIO_QUALITY_G711U = 11;

    public static final int AUDIO_QUALITY_G723 = 12;

    public static final int AUDIO_QUALITY_G711A = 13;

    public static final int AUDIO_QUALITY_G722 = 14;

    public static final int AUDIO_QUALITY_G711AB = 15;

    public static final int AUDIO_QUALITY_G729 = 16;

    public static final int AUDIO_QUALITY_EVS_NB = 17;

    public static final int AUDIO_QUALITY_EVS_WB = 18;

    public static final int AUDIO_QUALITY_EVS_SWB = 19;

    public static final int AUDIO_QUALITY_EVS_FB = 20;



   /**

     * Video information