Merge "Expose adhoc conference calling API as public." am: 8ebbe3c038 am:... (d5be65f2) · Commits · e / os / android_frameworks_base

api/current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -45404,6 +45404,7 @@ package android.system {
		package android.telecom {

		public final class Call {
		method public void addConferenceParticipants(@NonNull java.util.List<android.net.Uri>);
		method public void answer(int);
		method public void conference(android.telecom.Call);
		method public void deflect(android.net.Uri);
		@@ -45512,6 +45513,7 @@ package android.telecom {
		method public static boolean hasProperty(int, int);
		method public boolean hasProperty(int);
		method public static String propertiesToString(int);
		field public static final int CAPABILITY_ADD_PARTICIPANT = 33554432; // 0x2000000
		field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 4194304; // 0x400000
		field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
		field public static final int CAPABILITY_CAN_PULL_CALL = 8388608; // 0x800000
		@@ -45541,6 +45543,7 @@ package android.telecom {
		field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2
		field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80
		field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
		field public static final int PROPERTY_IS_ADHOC_CONFERENCE = 8192; // 0x2000
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40
		field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800
		field public static final int PROPERTY_RTT = 1024; // 0x400
		@@ -45618,6 +45621,7 @@ package android.telecom {
		public abstract class Conference extends android.telecom.Conferenceable {
		ctor public Conference(android.telecom.PhoneAccountHandle);
		method public final boolean addConnection(android.telecom.Connection);
		method @NonNull public static android.telecom.Conference createFailedConference(@NonNull android.telecom.DisconnectCause, @NonNull android.telecom.PhoneAccountHandle);
		method public final void destroy();
		method public final android.telecom.CallAudioState getCallAudioState();
		method public final java.util.List<android.telecom.Connection> getConferenceableConnections();
		@@ -45633,6 +45637,9 @@ package android.telecom {
		method public final android.telecom.StatusHints getStatusHints();
		method public android.telecom.Connection.VideoProvider getVideoProvider();
		method public int getVideoState();
		method public final boolean isRingbackRequested();
		method public void onAddConferenceParticipants(@NonNull java.util.List<android.net.Uri>);
		method public void onAnswer(int);
		method public void onCallAudioStateChanged(android.telecom.CallAudioState);
		method public void onConnectionAdded(android.telecom.Connection);
		method public void onDisconnect();
		@@ -45641,6 +45648,7 @@ package android.telecom {
		method public void onMerge(android.telecom.Connection);
		method public void onMerge();
		method public void onPlayDtmfTone(char);
		method public void onReject();
		method public void onSeparate(android.telecom.Connection);
		method public void onStopDtmfTone();
		method public void onSwap();
		@@ -45661,6 +45669,8 @@ package android.telecom {
		method public final void setDisconnected(android.telecom.DisconnectCause);
		method public final void setExtras(@Nullable android.os.Bundle);
		method public final void setOnHold();
		method public final void setRingbackRequested(boolean);
		method public final void setRinging();
		method public final void setStatusHints(android.telecom.StatusHints);
		method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
		method public final void setVideoState(android.telecom.Connection, int);
		@@ -45697,6 +45707,7 @@ package android.telecom {
		method public final boolean isRingbackRequested();
		method public final void notifyConferenceMergeFailed();
		method public void onAbort();
		method public void onAddConferenceParticipants(@NonNull java.util.List<android.net.Uri>);
		method public void onAnswer(int);
		method public void onAnswer();
		method public void onCallAudioStateChanged(android.telecom.CallAudioState);
		@@ -45776,6 +45787,7 @@ package android.telecom {
		field public static final int AUDIO_CODEC_GSM_HR = 10; // 0xa
		field public static final int AUDIO_CODEC_NONE = 0; // 0x0
		field public static final int AUDIO_CODEC_QCELP13K = 3; // 0x3
		field public static final int CAPABILITY_ADD_PARTICIPANT = 67108864; // 0x4000000
		field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000
		field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
		field public static final int CAPABILITY_CAN_PULL_CALL = 16777216; // 0x1000000
		@@ -45819,6 +45831,7 @@ package android.telecom {
		field public static final int PROPERTY_ASSISTED_DIALING = 512; // 0x200
		field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20
		field public static final int PROPERTY_HIGH_DEF_AUDIO = 4; // 0x4
		field public static final int PROPERTY_IS_ADHOC_CONFERENCE = 4096; // 0x1000
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10
		field public static final int PROPERTY_IS_RTT = 256; // 0x100
		field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 1024; // 0x400
		@@ -45914,9 +45927,13 @@ package android.telecom {
		method public void onConference(android.telecom.Connection, android.telecom.Connection);
		method public void onConnectionServiceFocusGained();
		method public void onConnectionServiceFocusLost();
		method @Nullable public android.telecom.Conference onCreateIncomingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
		method public void onCreateIncomingConferenceFailed(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onCreateIncomingConnectionFailed(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateIncomingHandoverConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method @Nullable public android.telecom.Conference onCreateOutgoingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
		method public void onCreateOutgoingConferenceFailed(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onCreateOutgoingConnectionFailed(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateOutgoingHandoverConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		@@ -46227,6 +46244,7 @@ package android.telecom {
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall();
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall(int);
		method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle);
		method public void addNewIncomingConference(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.os.Bundle);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void cancelMissedCallsNotification();
		method public android.content.Intent createManageBlockedNumbersIntent();
		method @Deprecated @RequiresPermission(android.Manifest.permission.ANSWER_PHONE_CALLS) public boolean endCall();
		@@ -46254,6 +46272,7 @@ package android.telecom {
		method public void registerPhoneAccount(android.telecom.PhoneAccount);
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void showInCallScreen(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void silenceRinger();
		method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void startConference(@NonNull java.util.List<android.net.Uri>, @NonNull android.os.Bundle);
		method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);
		field public static final String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER";
		field public static final String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
		@@ -46793,6 +46812,8 @@ package android.telephony {
		field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";
		field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";
		field public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";
		field public static final String KEY_SUPPORT_ADD_CONFERENCE_PARTICIPANTS_BOOL = "support_add_conference_participants_bool";
		field public static final String KEY_SUPPORT_ADHOC_CONFERENCE_CALLS_BOOL = "support_adhoc_conference_calls_bool";
		field public static final String KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL = "support_clir_network_default_bool";
		field public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";
		field public static final String KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL = "support_emergency_sms_over_ims_bool";

non-updatable-api/current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -43572,6 +43572,7 @@ package android.system {
		package android.telecom {

		public final class Call {
		method public void addConferenceParticipants(@NonNull java.util.List<android.net.Uri>);
		method public void answer(int);
		method public void conference(android.telecom.Call);
		method public void deflect(android.net.Uri);
		@@ -43680,6 +43681,7 @@ package android.telecom {
		method public static boolean hasProperty(int, int);
		method public boolean hasProperty(int);
		method public static String propertiesToString(int);
		field public static final int CAPABILITY_ADD_PARTICIPANT = 33554432; // 0x2000000
		field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 4194304; // 0x400000
		field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
		field public static final int CAPABILITY_CAN_PULL_CALL = 8388608; // 0x800000
		@@ -43709,6 +43711,7 @@ package android.telecom {
		field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2
		field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80
		field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
		field public static final int PROPERTY_IS_ADHOC_CONFERENCE = 8192; // 0x2000
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40
		field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800
		field public static final int PROPERTY_RTT = 1024; // 0x400
		@@ -43786,6 +43789,7 @@ package android.telecom {
		public abstract class Conference extends android.telecom.Conferenceable {
		ctor public Conference(android.telecom.PhoneAccountHandle);
		method public final boolean addConnection(android.telecom.Connection);
		method @NonNull public static android.telecom.Conference createFailedConference(@NonNull android.telecom.DisconnectCause, @NonNull android.telecom.PhoneAccountHandle);
		method public final void destroy();
		method public final android.telecom.CallAudioState getCallAudioState();
		method public final java.util.List<android.telecom.Connection> getConferenceableConnections();
		@@ -43801,6 +43805,9 @@ package android.telecom {
		method public final android.telecom.StatusHints getStatusHints();
		method public android.telecom.Connection.VideoProvider getVideoProvider();
		method public int getVideoState();
		method public final boolean isRingbackRequested();
		method public void onAddConferenceParticipants(@NonNull java.util.List<android.net.Uri>);
		method public void onAnswer(int);
		method public void onCallAudioStateChanged(android.telecom.CallAudioState);
		method public void onConnectionAdded(android.telecom.Connection);
		method public void onDisconnect();
		@@ -43809,6 +43816,7 @@ package android.telecom {
		method public void onMerge(android.telecom.Connection);
		method public void onMerge();
		method public void onPlayDtmfTone(char);
		method public void onReject();
		method public void onSeparate(android.telecom.Connection);
		method public void onStopDtmfTone();
		method public void onSwap();
		@@ -43829,6 +43837,8 @@ package android.telecom {
		method public final void setDisconnected(android.telecom.DisconnectCause);
		method public final void setExtras(@Nullable android.os.Bundle);
		method public final void setOnHold();
		method public final void setRingbackRequested(boolean);
		method public final void setRinging();
		method public final void setStatusHints(android.telecom.StatusHints);
		method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
		method public final void setVideoState(android.telecom.Connection, int);
		@@ -43865,6 +43875,7 @@ package android.telecom {
		method public final boolean isRingbackRequested();
		method public final void notifyConferenceMergeFailed();
		method public void onAbort();
		method public void onAddConferenceParticipants(@NonNull java.util.List<android.net.Uri>);
		method public void onAnswer(int);
		method public void onAnswer();
		method public void onCallAudioStateChanged(android.telecom.CallAudioState);
		@@ -43944,6 +43955,7 @@ package android.telecom {
		field public static final int AUDIO_CODEC_GSM_HR = 10; // 0xa
		field public static final int AUDIO_CODEC_NONE = 0; // 0x0
		field public static final int AUDIO_CODEC_QCELP13K = 3; // 0x3
		field public static final int CAPABILITY_ADD_PARTICIPANT = 67108864; // 0x4000000
		field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000
		field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
		field public static final int CAPABILITY_CAN_PULL_CALL = 16777216; // 0x1000000
		@@ -43987,6 +43999,7 @@ package android.telecom {
		field public static final int PROPERTY_ASSISTED_DIALING = 512; // 0x200
		field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20
		field public static final int PROPERTY_HIGH_DEF_AUDIO = 4; // 0x4
		field public static final int PROPERTY_IS_ADHOC_CONFERENCE = 4096; // 0x1000
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10
		field public static final int PROPERTY_IS_RTT = 256; // 0x100
		field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 1024; // 0x400
		@@ -44082,9 +44095,13 @@ package android.telecom {
		method public void onConference(android.telecom.Connection, android.telecom.Connection);
		method public void onConnectionServiceFocusGained();
		method public void onConnectionServiceFocusLost();
		method @Nullable public android.telecom.Conference onCreateIncomingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
		method public void onCreateIncomingConferenceFailed(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onCreateIncomingConnectionFailed(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateIncomingHandoverConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method @Nullable public android.telecom.Conference onCreateOutgoingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
		method public void onCreateOutgoingConferenceFailed(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onCreateOutgoingConnectionFailed(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public android.telecom.Connection onCreateOutgoingHandoverConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		@@ -44395,6 +44412,7 @@ package android.telecom {
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall();
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall(int);
		method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle);
		method public void addNewIncomingConference(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.os.Bundle);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void cancelMissedCallsNotification();
		method public android.content.Intent createManageBlockedNumbersIntent();
		method @Deprecated @RequiresPermission(android.Manifest.permission.ANSWER_PHONE_CALLS) public boolean endCall();
		@@ -44422,6 +44440,7 @@ package android.telecom {
		method public void registerPhoneAccount(android.telecom.PhoneAccount);
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void showInCallScreen(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void silenceRinger();
		method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void startConference(@NonNull java.util.List<android.net.Uri>, @NonNull android.os.Bundle);
		method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);
		field public static final String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER";
		field public static final String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
		@@ -44961,6 +44980,8 @@ package android.telephony {
		field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";
		field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";
		field public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";
		field public static final String KEY_SUPPORT_ADD_CONFERENCE_PARTICIPANTS_BOOL = "support_add_conference_participants_bool";
		field public static final String KEY_SUPPORT_ADHOC_CONFERENCE_CALLS_BOOL = "support_adhoc_conference_calls_bool";
		field public static final String KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL = "support_clir_network_default_bool";
		field public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";
		field public static final String KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL = "support_emergency_sms_over_ims_bool";

telecomm/java/android/telecom/Call.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -462,8 +462,8 @@ public final class Call {

		/**
		* Call supports adding participants to the call via
		* {@link #addConferenceParticipants(List)}.
		* @hide
		* {@link #addConferenceParticipants(List)}. Once participants are added, the call becomes
		* an adhoc conference call ({@link #PROPERTY_IS_ADHOC_CONFERENCE}).
		*/
		public static final int CAPABILITY_ADD_PARTICIPANT = 0x02000000;

		@@ -599,8 +599,11 @@ public final class Call {

		/**
		* Indicates that the call is an adhoc conference call. This property can be set for both
		* incoming and outgoing calls.
		* @hide
		* incoming and outgoing calls. An adhoc conference call is formed using
		* {@link #addConferenceParticipants(List)},
		* {@link TelecomManager#addNewIncomingConference(PhoneAccountHandle, Bundle)}, or
		* {@link TelecomManager#startConference(List, Bundle)}, rather than by merging existing
		* call using {@link #conference(Call)}.
		*/
		public static final int PROPERTY_IS_ADHOC_CONFERENCE = 0x00002000;

		@@ -1775,7 +1778,6 @@ public final class Call {
		* See {@link Details#CAPABILITY_ADD_PARTICIPANT}.
		*
		* @param participants participants to be pulled to existing call.
		* @hide
		*/
		public void addConferenceParticipants(@NonNull List<Uri> participants) {
		mInCallAdapter.addConferenceParticipants(mTelecomCallId, participants);

telecomm/java/android/telecom/Conference.java

+2 −8

Original line number	Diff line number	Diff line
		@@ -181,8 +181,8 @@ public abstract class Conference extends Conferenceable {

		/**
		* Returns whether this conference is requesting that the system play a ringback tone
		* on its behalf.
		* @hide
		* on its behalf. A ringback tone may be played when an outgoing conference is in the process of
		* connecting to give the user an audible indication of that process.
		*/
		public final boolean isRingbackRequested() {
		return mRingbackRequested;
		@@ -329,7 +329,6 @@ public abstract class Conference extends Conferenceable {
		/**
		* Notifies the {@link Conference} of a request to add a new participants to the conference call
		* @param participants that will be added to this conference call
		* @hide
		*/
		public void onAddConferenceParticipants(@NonNull List<Uri> participants) {}

		@@ -340,7 +339,6 @@ public abstract class Conference extends Conferenceable {
		* the default dialer's {@link InCallService}.
		*
		* @param videoState The video state in which to answer the connection.
		* @hide
		*/
		public void onAnswer(int videoState) {}

		@@ -360,7 +358,6 @@ public abstract class Conference extends Conferenceable {
		* a request to reject.
		* For managed {@link ConnectionService}s, this will be called when the user rejects a call via
		* the default dialer's {@link InCallService}.
		* @hide
		*/
		public void onReject() {}

		@@ -380,7 +377,6 @@ public abstract class Conference extends Conferenceable {

		/**
		* Sets state to be ringing.
		* @hide
		*/
		public final void setRinging() {
		setState(Connection.STATE_RINGING);
		@@ -506,7 +502,6 @@ public abstract class Conference extends Conferenceable {
		* that do not play a ringback tone themselves in the conference's audio stream.
		*
		* @param ringback Whether the ringback tone is to be played.
		* @hide
		*/
		public final void setRingbackRequested(boolean ringback) {
		if (mRingbackRequested != ringback) {
		@@ -773,7 +768,6 @@ public abstract class Conference extends Conferenceable {
		*
		* @param disconnectCause The disconnect cause, ({@see android.telecomm.DisconnectCause}).
		* @return A {@code Conference} which indicates failure.
		* @hide
		*/
		public @NonNull static Conference createFailedConference(
		@NonNull DisconnectCause disconnectCause, @NonNull PhoneAccountHandle phoneAccount) {

telecomm/java/android/telecom/Connection.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -383,8 +383,10 @@ public abstract class Connection extends Conferenceable {

		/**
		* When set, indicates that this {@link Connection} supports initiation of a conference call
		* by directly adding participants using {@link #onAddConferenceParticipants(List)}.
		* @hide
		* by directly adding participants using {@link #onAddConferenceParticipants(List)}. When
		* participants are added to a {@link Connection}, it will be replaced by a {@link Conference}
		* instance with {@link #PROPERTY_IS_ADHOC_CONFERENCE} set to indicate that it is an adhoc
		* conference call.
		*/
		public static final int CAPABILITY_ADD_PARTICIPANT = 0x04000000;

		@@ -526,10 +528,9 @@ public abstract class Connection extends Conferenceable {
		public static final int PROPERTY_REMOTELY_HOSTED = 1 << 11;

		/**
		* Set by the framework to indicate that it is an adhoc conference call.
		* Set by the framework to indicate that a call is an adhoc conference call.
		* <p>
		* This is used for Outgoing and incoming conference calls.
		* @hide
		* This is used for outgoing and incoming conference calls.
		*/
		public static final int PROPERTY_IS_ADHOC_CONFERENCE = 1 << 12;

		@@ -3034,7 +3035,6 @@ public abstract class Connection extends Conferenceable {
		* Supports initiation of a conference call by directly adding participants to an ongoing call.
		*
		* @param participants with which conference call will be formed.
		* @hide
		*/
		public void onAddConferenceParticipants(@NonNull List<Uri> participants) {}