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

Commit 8581b67e authored by Andrew Lee's avatar Andrew Lee Committed by Android (Google) Code Review
Browse files

Merge "Suffix VT_LOCAL and VT_REMOTE with BIDIRECTIONAL."

parents cf60d9f5 9a8f9ce7

telecomm/java/android/telecom/Call.java

+6 −6
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public final class Call { 
         * Local device supports bidirectional video calling.

         * @hide

         */

        public static final int CAPABILITY_SUPPORTS_VT_LOCAL =

        public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL =

                CAPABILITY_SUPPORTS_VT_LOCAL_RX | CAPABILITY_SUPPORTS_VT_LOCAL_TX;



        /**
@@ -175,7 +175,7 @@ public final class Call { 
         * Remote device supports bidirectional video calling.

         * @hide

         */

        public static final int CAPABILITY_SUPPORTS_VT_REMOTE =

        public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL =

                CAPABILITY_SUPPORTS_VT_REMOTE_RX | CAPABILITY_SUPPORTS_VT_REMOTE_TX;



        /**
@@ -298,8 +298,8 @@ public final class Call { 
            if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_TX)) {

                builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_TX");

            }

            if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL)) {

                builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL");

            if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL)) {

                builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL");

            }

            if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_RX)) {

                builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_RX");
@@ -307,8 +307,8 @@ public final class Call { 
            if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_TX)) {

                builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_TX");

            }

            if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) {

                builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE");

            if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL)) {

                builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL");

            }

            if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {

                builder.append(" CAPABILITY_HIGH_DEF_AUDIO");

telecomm/java/android/telecom/Connection.java

+6 −6
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public abstract class Connection implements IConferenceable { 
     * Local device supports bidirectional video calling.

     * @hide

     */

    public static final int CAPABILITY_SUPPORTS_VT_LOCAL =

    public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL =

            CAPABILITY_SUPPORTS_VT_LOCAL_RX | CAPABILITY_SUPPORTS_VT_LOCAL_TX;



    /**
@@ -140,7 +140,7 @@ public abstract class Connection implements IConferenceable { 
     * Remote device supports bidirectional video calling.

     * @hide

     */

    public static final int CAPABILITY_SUPPORTS_VT_REMOTE =

    public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL =

            CAPABILITY_SUPPORTS_VT_REMOTE_RX | CAPABILITY_SUPPORTS_VT_REMOTE_TX;



    /**
@@ -267,8 +267,8 @@ public abstract class Connection implements IConferenceable { 
        if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_TX)) {

            builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_TX");

        }

        if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL)) {

            builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL");

        if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL)) {

            builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL");

        }

        if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_RX)) {

            builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_RX");
@@ -276,8 +276,8 @@ public abstract class Connection implements IConferenceable { 
        if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_TX)) {

            builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_TX");

        }

        if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) {

            builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE");

        if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL)) {

            builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL");

        }

        if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {

            builder.append(" CAPABILITY_HIGH_DEF_AUDIO");