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

Commit 0d349353 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Add capability to determine if downgrade to audio is denied."

parents 6d03819a f97a009f

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -35247,6 +35247,7 @@ package android.telecom { 
    method public static boolean hasProperty(int, int);

    method public boolean hasProperty(int);

    method public static java.lang.String propertiesToString(int);

    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 4194304; // 0x400000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000

    field public static final int CAPABILITY_HOLD = 1; // 0x1
@@ -35387,6 +35388,7 @@ package android.telecom { 
    method public final void setVideoProvider(android.telecom.Connection.VideoProvider);

    method public final void setVideoState(int);

    method public static java.lang.String stateToString(int);

    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000

    field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -37540,6 +37540,7 @@ package android.telecom { 
    method public static boolean hasProperty(int, int);

    method public boolean hasProperty(int);

    method public static java.lang.String propertiesToString(int);

    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 4194304; // 0x400000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000

    field public static final int CAPABILITY_HOLD = 1; // 0x1
@@ -37691,6 +37692,7 @@ package android.telecom { 
    method public final void setVideoProvider(android.telecom.Connection.VideoProvider);

    method public final void setVideoState(int);

    method public static java.lang.String stateToString(int);

    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000

    field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -35261,6 +35261,7 @@ package android.telecom { 
    method public static boolean hasProperty(int, int);

    method public boolean hasProperty(int);

    method public static java.lang.String propertiesToString(int);

    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 4194304; // 0x400000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000

    field public static final int CAPABILITY_HOLD = 1; // 0x1
@@ -35401,6 +35402,7 @@ package android.telecom { 
    method public final void setVideoProvider(android.telecom.Connection.VideoProvider);

    method public final void setVideoState(int);

    method public static java.lang.String stateToString(int);

    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000

    field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000

telecomm/java/android/telecom/Call.java

+19 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.Handler; 
import java.lang.String;

import java.util.ArrayList;

import java.util.Collections;

import java.util.LinkedList;

import java.util.List;

import java.util.Map;

import java.util.Objects;
@@ -210,7 +209,22 @@ public final class Call { 
         * Call sends responses through connection.

         * @hide

         */

        public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 0x00400000;

        public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 0x00200000;



        /**

         * When set, prevents a video {@code Call} from being downgraded to an audio-only call.

         * <p>

         * Should be set when the VideoState has the {@link VideoProfile#STATE_TX_ENABLED} or

         * {@link VideoProfile#STATE_RX_ENABLED} bits set to indicate that the connection cannot be

         * downgraded from a video call back to a VideoState of

         * {@link VideoProfile#STATE_AUDIO_ONLY}.

         * <p>

         * Intuitively, a call which can be downgraded to audio should also have local and remote

         * video

         * capabilities (see {@link #CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL} and

         * {@link #CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL}).

         */

        public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 0x00400000;



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

        // Next CAPABILITY value: 0x00800000
@@ -332,6 +346,9 @@ public final class Call { 
            if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_TX)) {

                builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_TX");

            }

            if (can(capabilities, CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO)) {

                builder.append(" CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO");

            }

            if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL)) {

                builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL");

            }

telecomm/java/android/telecom/Connection.java

+19 −1
Original line number Diff line number Diff line
@@ -255,8 +255,23 @@ public abstract class Connection extends Conferenceable { 
     */

    public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 0x00400000;



    /**

     * When set, prevents a video call from being downgraded to an audio-only call.

     * <p>

     * Should be set when the VideoState has the {@link VideoProfile#STATE_TX_ENABLED} or

     * {@link VideoProfile#STATE_RX_ENABLED} bits set to indicate that the connection cannot be

     * downgraded from a video call back to a VideoState of

     * {@link VideoProfile#STATE_AUDIO_ONLY}.

     * <p>

     * Intuitively, a call which can be downgraded to audio should also have local and remote

     * video

     * capabilities (see {@link #CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL} and

     * {@link #CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL}).

     */

    public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 0x00800000;



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

    // Next CAPABILITY value: 0x00800000

    // Next CAPABILITY value: 0x01000000

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



    /**
@@ -371,6 +386,9 @@ public abstract class Connection extends Conferenceable { 
        if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL)) {

            builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL");

        }

        if (can(capabilities, CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO)) {

            builder.append(" CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO");

        }

        if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {

            builder.append(" CAPABILITY_HIGH_DEF_AUDIO");

        }