Merge "Expose ImsCallProfile.EXTRA_CONFERENCE and EXTRA_CONFERENCE_AVAIL."

2 files changed, 37 insertions, 1 deletions

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 8fd48a591855..d040f41aa9ce 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -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";
diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java
index aaa68d6f7d57..b15f4edeb79f 100644
--- a/telephony/java/android/telephony/ims/ImsCallProfile.java
+++ b/telephony/java/android/telephony/ims/ImsCallProfile.java
@@ -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";