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

Commit bbdfc69d authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "IMS: Propagate RTT capability of the called party to UI" am: 57704bd7 am: 86da26a4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/696027

Change-Id: I389a90e671bea7920f20e97ca4335cfc6e938fea
parents ab6e8374 86da26a4

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -39607,6 +39607,7 @@ package android.telecom { 
    field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80

    field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4

    field public static final int CAPABILITY_MUTE = 64; // 0x40

    field public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 268435456; // 0x10000000

    field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20

    field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000

    field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
@@ -39893,6 +39894,7 @@ package android.telecom { 
    field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80

    field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4

    field public static final int CAPABILITY_MUTE = 64; // 0x40

    field public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 536870912; // 0x20000000

    field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20

    field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000

    field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300

telecomm/java/android/telecom/Call.java

100755 → 100644
+10 −1
Original line number Diff line number Diff line
@@ -564,8 +564,14 @@ public final class Call { 
         */

        public static final int CAPABILITY_TRANSFER_CONSULTATIVE = 0x08000000;



        /**

         * Indicates whether the remote party supports RTT or not to the UI.

         */



        public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 0x10000000;



        //******************************************************************************************

        // Next CAPABILITY value: 0x10000000

        // Next CAPABILITY value: 0x20000000

        //******************************************************************************************



        /**
@@ -817,6 +823,9 @@ public final class Call { 
            if (can(capabilities, CAPABILITY_TRANSFER_CONSULTATIVE)) {

                builder.append(" CAPABILITY_TRANSFER_CONSULTATIVE");

            }

            if (can(capabilities, CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT)) {

                builder.append(" CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT");

            }

            builder.append("]");

            return builder.toString();

        }

telecomm/java/android/telecom/Connection.java

+11 −1
Original line number Diff line number Diff line
@@ -422,8 +422,14 @@ public abstract class Connection extends Conferenceable { 
     */

    public static final int CAPABILITY_TRANSFER_CONSULTATIVE = 0x10000000;



    /**

     * Indicates whether the remote party supports RTT or not to the UI.

     */



    public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 0x20000000;



    //**********************************************************************************************

    // Next CAPABILITY value: 0x20000000

    // Next CAPABILITY value: 0x40000000

    //**********************************************************************************************



    /**
@@ -1138,6 +1144,10 @@ public abstract class Connection extends Conferenceable { 
                == CAPABILITY_TRANSFER_CONSULTATIVE) {

            builder.append(isLong ? " CAPABILITY_TRANSFER_CONSULTATIVE" : " sup_cTrans");

        }

        if ((capabilities & CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT)

                == CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT) {

            builder.append(isLong ? " CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT" : " sup_rtt");

        }

        builder.append("]");

        return builder.toString();

    }