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

Commit d5601885 authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am:... 

Merge "Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling." am: b31c9b47 am: ce4f99fd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535172

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac83990d1dcd99a1024b6eb77fc4a0201b268b7f
parents 3785d3ad ce4f99fd

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -38773,6 +38773,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_ADHOC_CONFERENCE_CALLING = 16384; // 0x4000

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

    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

telecomm/java/android/telecom/PhoneAccount.java

+10 −1
Original line number Diff line number Diff line
@@ -361,7 +361,13 @@ public final class PhoneAccount implements Parcelable { 
     */

    public static final int CAPABILITY_ADHOC_CONFERENCE_CALLING = 0x4000;



    /* NEXT CAPABILITY: 0x8000 */

    /**

     * Flag indicating whether this {@link PhoneAccount} is capable of supporting the call composer

     * functionality for enriched calls.

     */

    public static final int CAPABILITY_CALL_COMPOSER = 0x8000;



    /* NEXT CAPABILITY: 0x10000 */



    /**

     * URI scheme for telephone number URIs.
@@ -1088,6 +1094,9 @@ public final class PhoneAccount implements Parcelable { 
        if (hasCapabilities(CAPABILITY_ADHOC_CONFERENCE_CALLING)) {

            sb.append("AdhocConf");

        }

        if (hasCapabilities(CAPABILITY_CALL_COMPOSER)) {

            sb.append("CallComposer ");

        }

        return sb.toString();

    }