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

Commit d8da2554 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Android (Google) Code Review
Browse files

Merge "Expose ImsCallProfile.EXTRA_CONFERENCE and EXTRA_CONFERENCE_AVAIL."

parents 5c85cb20 3f2e0815

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -12081,9 +12081,11 @@ package android.telephony.ims { 
    field public static final String EXTRA_CNA = "cna";

    field public static final String EXTRA_CNAP = "cnap";

    field public static final String EXTRA_CODEC = "Codec";

    field public static final String EXTRA_CONFERENCE = "android.telephony.ims.extra.CONFERENCE";

    field public static final String EXTRA_DIALSTRING = "dialstring";

    field public static final String EXTRA_DISPLAY_TEXT = "DisplayText";

    field public static final String EXTRA_EMERGENCY_CALL = "e_call";

    field public static final String EXTRA_EXTENDING_TO_CONFERENCE_SUPPORTED = "android.telephony.ims.extra.EXTENDING_TO_CONFERENCE_SUPPORTED";

    field public static final String EXTRA_FORWARDED_NUMBER = "android.telephony.ims.extra.FORWARDED_NUMBER";

    field public static final String EXTRA_IS_CALL_PULL = "CallPull";

    field public static final String EXTRA_LOCATION = "android.telephony.ims.extra.LOCATION";

telephony/java/android/telephony/ims/ImsCallProfile.java

+35 −1
Original line number Diff line number Diff line
@@ -133,10 +133,26 @@ public final class ImsCallProfile implements Parcelable { 
     *      the video during voice call.

     *  conference_avail : Indicates if the session can be extended to the conference.

     */



    /**

     * Indicates if the session is for a conference call or not. If not defined, should be

     * considered {@code false}.

     * Boolean extra properties - {@code true} / {@code false}.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_CONFERENCE = "android.telephony.ims.extra.CONFERENCE";



    /**

     * The previous string of EXTRA_CONFERENCE. Use EXTRA_CONFERENCE whenever possible.

     * For external app or vendor code backward compatibility, we should always set value for both

     * EXTRA_CONFERENCE_DEPRECATED and EXTRA_CONFERENCE.

     *

     * @deprecated Remove when not needed anymore.

     *

     * @hide

     */

    public static final String EXTRA_CONFERENCE = "conference";

    public static final String EXTRA_CONFERENCE_DEPRECATED = "conference";



    /**

     * Boolean extra property set on an {@link ImsCallProfile} to indicate that this call is an
@@ -153,7 +169,25 @@ public final class ImsCallProfile implements Parcelable { 
     * @hide

     */

    public static final String EXTRA_CALL_MODE_CHANGEABLE = "call_mode_changeable";



    /**

     * Indicates if the session can be extended to a conference call. If not defined, should be

     * considered {@code false}.

     * Boolean extra properties - {@code true} / {@code false}.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_EXTENDING_TO_CONFERENCE_SUPPORTED =

            "android.telephony.ims.extra.EXTENDING_TO_CONFERENCE_SUPPORTED";



    /**

     * The previous string of EXTRA_EXTENDING_TO_CONFERENCE_SUPPORTED.

     * Use EXTRA_EXTENDING_TO_CONFERENCE_SUPPORTED whenever possible.

     * For backward compatibility, we should always set value for both

     * EXTRA_EXTENDING_TO_CONFERENCE_SUPPORTED and EXTRA_CONFERENCE_AVAIL.

     *

     * @deprecated Remove when not needed anymore.

     *

     * @hide

     */

    public static final String EXTRA_CONFERENCE_AVAIL = "conference_avail";