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

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

Merge "Cleanup of Video Call pause functionality." into m-wireless-dev

parents e593d0ae b5e0cfb2

telecomm/java/android/telecom/Call.java

+13 −3
Original line number Diff line number Diff line
@@ -222,13 +222,20 @@ public final class Call { 
        public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000;



        /**

         * Call type can be modified for IMS call

         * Call can be upgraded to a video call.

         * @hide

         */

        public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 0x00080000;



        /**

         * For video calls, indicates whether the outgoing video for the call can be paused using

         * the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState.

         * @hide

         */

        public static final int CAPABILITY_CAN_PAUSE_VIDEO = 0x00100000;



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

        // Next CAPABILITY value: 0x00100000

        // Next CAPABILITY value: 0x00200000

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



        private final Uri mHandle;
@@ -335,6 +342,9 @@ public final class Call { 
            if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) {

                builder.append(" CAPABILITY_CAN_UPGRADE_TO_VIDEO");

            }

            if (can(capabilities, CAPABILITY_CAN_PAUSE_VIDEO)) {

                builder.append(" CAPABILITY_CAN_PAUSE_VIDEO");

            }

            builder.append("]");

            return builder.toString();

        }

telecomm/java/android/telecom/Connection.java

+12 −2
Original line number Diff line number Diff line
@@ -187,13 +187,20 @@ public abstract class Connection implements IConferenceable { 
    public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000;



    /**

     * Call type can be modified for IMS call

     * Call can be upgraded to a video call.

     * @hide

     */

    public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 0x00080000;



    /**

     * For video calls, indicates whether the outgoing video for the call can be paused using

     * the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState.

     * @hide

     */

    public static final int CAPABILITY_CAN_PAUSE_VIDEO = 0x00100000;



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

    // Next CAPABILITY value: 0x00100000

    // Next CAPABILITY value: 0x00200000

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



    /**
@@ -345,6 +352,9 @@ public abstract class Connection implements IConferenceable { 
        if (can(capabilities, CAPABILITY_CAN_UPGRADE_TO_VIDEO)) {

            builder.append(" CAPABILITY_CAN_UPGRADE_TO_VIDEO");

        }

        if (can(capabilities, CAPABILITY_CAN_PAUSE_VIDEO)) {

            builder.append(" CAPABILITY_CAN_PAUSE_VIDEO");

        }

        builder.append("]");

        return builder.toString();

    }