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

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

Merge "Add "Call subject" capability to phone accounts." into mnc-dev

parents 3551a59b 65a3d343

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30288,6 +30288,7 @@ package android.telecom { 
    method public android.telecom.PhoneAccount.Builder toBuilder();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2

    field public static final int CAPABILITY_CALL_SUBJECT = 64; // 0x40

    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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32496,6 +32496,7 @@ package android.telecom { 
    method public android.telecom.PhoneAccount.Builder toBuilder();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2

    field public static final int CAPABILITY_CALL_SUBJECT = 64; // 0x40

    field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1

    field public static final int CAPABILITY_MULTI_USER = 32; // 0x20

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

telecomm/java/android/telecom/PhoneAccount.java

+9 −0
Original line number Diff line number Diff line
@@ -111,6 +111,15 @@ public final class PhoneAccount implements Parcelable { 
    @SystemApi

    public static final int CAPABILITY_MULTI_USER = 0x20;



    /**

     * Flag indicating that this {@code PhoneAccount} supports a subject for Calls.  This means a

     * caller is able to specify a short subject line for an outgoing call.  A capable receiving

     * device displays the call subject on the incoming call screen.

     * <p>

     * See {@link #getCapabilities}

     */

    public static final int CAPABILITY_CALL_SUBJECT = 0x40;



    /**

     * URI scheme for telephone number URIs.

     */