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

Commit 8b58e73c authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." 

am: 8223dc1a

Change-Id: Id8c6077d099f9ef943c09242acb22173b6628c1a
parents 5f9ac420 8223dc1a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36511,6 +36511,7 @@ package android.telecom { 
    field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1

    field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10

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

    field public static final int CAPABILITY_SUPPORTS_VIDEO_CALLING = 1024; // 0x400

    field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8

    field public static final int CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE = 256; // 0x100

    field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39534,6 +39534,7 @@ package android.telecom { 
    field public static final int CAPABILITY_MULTI_USER = 32; // 0x20

    field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10

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

    field public static final int CAPABILITY_SUPPORTS_VIDEO_CALLING = 1024; // 0x400

    field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8

    field public static final int CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE = 256; // 0x100

    field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36593,6 +36593,7 @@ package android.telecom { 
    field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1

    field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10

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

    field public static final int CAPABILITY_SUPPORTS_VIDEO_CALLING = 1024; // 0x400

    field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8

    field public static final int CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE = 256; // 0x100

    field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;

telecomm/java/android/telecom/PhoneAccount.java

+24 −1
Original line number Diff line number Diff line
@@ -114,7 +114,10 @@ public final class PhoneAccount implements Parcelable { 
    public static final int CAPABILITY_SIM_SUBSCRIPTION = 0x4;



    /**

     * Flag indicating that this {@code PhoneAccount} is capable of placing video calls.

     * Flag indicating that this {@code PhoneAccount} is currently able to place video calls.

     * <p>

     * See also {@link #CAPABILITY_SUPPORTS_VIDEO_CALLING} which indicates whether the

     * {@code PhoneAccount} supports placing video calls.

     * <p>

     * See {@link #getCapabilities}

     */
@@ -178,6 +181,23 @@ public final class PhoneAccount implements Parcelable { 
     */

    public static final int CAPABILITY_EMERGENCY_VIDEO_CALLING = 0x200;



    /**

     * Flag indicating that this {@link PhoneAccount} supports video calling.

     * This is not an indication that the {@link PhoneAccount} is currently able to make a video

     * call, but rather that it has the ability to make video calls (but not necessarily at this

     * time).

     * <p>

     * Whether a {@link PhoneAccount} can make a video call is ultimately controlled by

     * {@link #CAPABILITY_VIDEO_CALLING}, which indicates whether the {@link PhoneAccount} is

     * currently capable of making a video call.  Consider a case where, for example, a

     * {@link PhoneAccount} supports making video calls (e.g.

     * {@link #CAPABILITY_SUPPORTS_VIDEO_CALLING}), but a current lack of network connectivity

     * prevents video calls from being made (e.g. {@link #CAPABILITY_VIDEO_CALLING}).

     * <p>

     * See {@link #getCapabilities}

     */

    public static final int CAPABILITY_SUPPORTS_VIDEO_CALLING = 0x400;



    /**

     * URI scheme for telephone number URIs.

     */
@@ -762,6 +782,9 @@ public final class PhoneAccount implements Parcelable { 
     */

    private String capabilitiesToString(int capabilities) {

        StringBuilder sb = new StringBuilder();

        if (hasCapabilities(CAPABILITY_SUPPORTS_VIDEO_CALLING)) {

            sb.append("SuppVideo ");

        }

        if (hasCapabilities(CAPABILITY_VIDEO_CALLING)) {

            sb.append("Video ");

        }