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

Commit bb2979d6 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Make CAPABILITY_CAN_PAUSE_VIDEO public"

parents 6eededad e661d9fb

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30062,6 +30062,7 @@ package android.telecom { 
    method public int getHandlePresentation();

    method public android.telecom.StatusHints getStatusHints();

    method public int getVideoState();

    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_GENERIC_CONFERENCE = 16384; // 0x4000

    field public static final int CAPABILITY_HIGH_DEF_AUDIO = 32768; // 0x8000

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32167,6 +32167,7 @@ package android.telecom { 
    method public int getHandlePresentation();

    method public android.telecom.StatusHints getStatusHints();

    method public int getVideoState();

    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_GENERIC_CONFERENCE = 16384; // 0x4000

    field public static final int CAPABILITY_HIGH_DEF_AUDIO = 32768; // 0x8000

telecomm/java/android/telecom/Call.java

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ public final class Call { 
        /**

         * 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;