Merge "IMS: Allow add participant with normal IMS call." (e515d746) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/ConnectionService.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -910,7 +910,10 @@ public abstract class ConnectionService extends Service {
		private void addParticipantWithConference(String callId, String participant) {
		Log.d(this, "ConnectionService addParticipantWithConference(%s, %s)", participant, callId);
		Conference conference = findConferenceForAction(callId, "addParticipantWithConference");
		if (conference != null) {
		Connection connection = findConnectionForAction(callId, "addParticipantWithConnection");
		if (connection != getNullConnection()) {
		onAddParticipant(connection, participant);
		} else if (conference != getNullConference()) {
		conference.onAddParticipant(participant);
		}
		}
		@@ -1197,6 +1200,19 @@ public abstract class ConnectionService extends Service {
		*/
		public void onConference(Connection connection1, Connection connection2) {}

		/**
		* Add participant with connection. Invoked when user has made a request to add
		* participant with specified connection. In response, the participant should add with
		* the connection.
		*
		* @param connection A connection where participant need to add.
		* @param participant Address of participant which will be added.
		* @return
		*
		* @hide
		*/
		public void onAddParticipant(Connection connection, String participant) {}

		/**
		* Indicates that a remote conference has been created for existing {@link RemoteConnection}s.
		* When this method is invoked, this {@link ConnectionService} should create its own