Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose ImsCallProfile.EXTRA_CONFERENCE and EXTRA_CONFERENCE_AVAIL."

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2020-12-24 01:07:01 +00:00
committed by Android (Google) Code Review
parent 5c85cb2054 3f2e081581
commit d8da25546d
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -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";

36
telephony/java/android/telephony/ims/ImsCallProfile.java
View File

@@ -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
*/
public static final String EXTRA_CONFERENCE = "conference";
@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_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";