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

api/current.txt

+21 −0

non-updatable-api/current.txt

+21 −0

telecomm/java/android/telecom/Call.java

+7 −5

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

	/**		/**
	* Call supports adding participants to the call via		* Call supports adding participants to the call via
	* {@link #addConferenceParticipants(List)}.		* {@link #addConferenceParticipants(List)}. Once participants are added, the call becomes
	* @hide		* an adhoc conference call ({@link #PROPERTY_IS_ADHOC_CONFERENCE}).
	*/		*/
	public static final int CAPABILITY_ADD_PARTICIPANT = 0x02000000;		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		* Indicates that the call is an adhoc conference call. This property can be set for both
	* incoming and outgoing calls.		* incoming and outgoing calls. An adhoc conference call is formed using
	* @hide		* {@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;		public static final int PROPERTY_IS_ADHOC_CONFERENCE = 0x00002000;

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

telecomm/java/android/telecom/Conference.java

+2 −8

Original line number	Original line	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		* Returns whether this conference is requesting that the system play a ringback tone
	* on its behalf.		* on its behalf. A ringback tone may be played when an outgoing conference is in the process of
	* @hide		* connecting to give the user an audible indication of that process.
	*/		*/
	public final boolean isRingbackRequested() {		public final boolean isRingbackRequested() {
	return mRingbackRequested;		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		* 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		* @param participants that will be added to this conference call
	* @hide
	*/		*/
	public void onAddConferenceParticipants(@NonNull List<Uri> participants) {}		public void onAddConferenceParticipants(@NonNull List<Uri> participants) {}

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

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

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

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

telecomm/java/android/telecom/Connection.java

+6 −6

Original line number	Original line	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		* When set, indicates that this {@link Connection} supports initiation of a conference call
	* by directly adding participants using {@link #onAddConferenceParticipants(List)}.		* by directly adding participants using {@link #onAddConferenceParticipants(List)}. When
	* @hide		* 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;		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;		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>		* <p>
	* This is used for Outgoing and incoming conference calls.		* This is used for outgoing and incoming conference calls.
	* @hide
	*/		*/
	public static final int PROPERTY_IS_ADHOC_CONFERENCE = 1 << 12;		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.		* Supports initiation of a conference call by directly adding participants to an ongoing call.
	*		*
	* @param participants with which conference call will be formed.		* @param participants with which conference call will be formed.
	* @hide
	*/		*/
	public void onAddConferenceParticipants(@NonNull List<Uri> participants) {}		public void onAddConferenceParticipants(@NonNull List<Uri> participants) {}

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

	public final class Call {		public final class Call {
			method public void addConferenceParticipants(@NonNull java.util.List<android.net.Uri>);
	method public void answer(int);		method public void answer(int);
	method public void conference(android.telecom.Call);		method public void conference(android.telecom.Call);
	method public void deflect(android.net.Uri);		method public void deflect(android.net.Uri);
	@@ -45512,6 +45513,7 @@ package android.telecom {
	method public static boolean hasProperty(int, int);		method public static boolean hasProperty(int, int);
	method public boolean hasProperty(int);		method public boolean hasProperty(int);
	method public static String propertiesToString(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_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_PAUSE_VIDEO = 1048576; // 0x100000
	field public static final int CAPABILITY_CAN_PULL_CALL = 8388608; // 0x800000		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_GENERIC_CONFERENCE = 2; // 0x2
	field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80		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_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_IS_EXTERNAL_CALL = 64; // 0x40
	field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800		field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800
	field public static final int PROPERTY_RTT = 1024; // 0x400		field public static final int PROPERTY_RTT = 1024; // 0x400
	@@ -45618,6 +45621,7 @@ package android.telecom {
	public abstract class Conference extends android.telecom.Conferenceable {		public abstract class Conference extends android.telecom.Conferenceable {
	ctor public Conference(android.telecom.PhoneAccountHandle);		ctor public Conference(android.telecom.PhoneAccountHandle);
	method public final boolean addConnection(android.telecom.Connection);		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 void destroy();
	method public final android.telecom.CallAudioState getCallAudioState();		method public final android.telecom.CallAudioState getCallAudioState();
	method public final java.util.List<android.telecom.Connection> getConferenceableConnections();		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 final android.telecom.StatusHints getStatusHints();
	method public android.telecom.Connection.VideoProvider getVideoProvider();		method public android.telecom.Connection.VideoProvider getVideoProvider();
	method public int getVideoState();		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 onCallAudioStateChanged(android.telecom.CallAudioState);

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

	public final class Call {		public final class Call {
			method public void addConferenceParticipants(@NonNull java.util.List<android.net.Uri>);
	method public void answer(int);		method public void answer(int);
	method public void conference(android.telecom.Call);		method public void conference(android.telecom.Call);
	method public void deflect(android.net.Uri);		method public void deflect(android.net.Uri);
	@@ -43680,6 +43681,7 @@ package android.telecom {
	method public static boolean hasProperty(int, int);		method public static boolean hasProperty(int, int);
	method public boolean hasProperty(int);		method public boolean hasProperty(int);
	method public static String propertiesToString(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_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_PAUSE_VIDEO = 1048576; // 0x100000
	field public static final int CAPABILITY_CAN_PULL_CALL = 8388608; // 0x800000		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_GENERIC_CONFERENCE = 2; // 0x2
	field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80		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_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_IS_EXTERNAL_CALL = 64; // 0x40
	field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800		field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800
	field public static final int PROPERTY_RTT = 1024; // 0x400		field public static final int PROPERTY_RTT = 1024; // 0x400
	@@ -43786,6 +43789,7 @@ package android.telecom {
	public abstract class Conference extends android.telecom.Conferenceable {		public abstract class Conference extends android.telecom.Conferenceable {
	ctor public Conference(android.telecom.PhoneAccountHandle);		ctor public Conference(android.telecom.PhoneAccountHandle);
	method public final boolean addConnection(android.telecom.Connection);		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 void destroy();
	method public final android.telecom.CallAudioState getCallAudioState();		method public final android.telecom.CallAudioState getCallAudioState();
	method public final java.util.List<android.telecom.Connection> getConferenceableConnections();		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 final android.telecom.StatusHints getStatusHints();
	method public android.telecom.Connection.VideoProvider getVideoProvider();		method public android.telecom.Connection.VideoProvider getVideoProvider();
	method public int getVideoState();		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 onCallAudioStateChanged(android.telecom.CallAudioState);