Merge "Ims: Add support for Adhoc Conference calls" (2e51f8e3) · Commits · e / os / frameworks_opt_net_ims

src/java/com/android/ims/ImsCall.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -1127,6 +1127,7 @@ public class ImsCall implements ICall {

		synchronized(mLockObj) {
		mSession = session;
		mIsConferenceHost = true;

		try {
		session.setListener(createCallSessionListener());
		@@ -2396,6 +2397,12 @@ public class ImsCall implements ICall {
		return;
		}

		if (mIsConferenceHost) {
		// If the dial request was a adhoc conf calling one, this call would have
		// been marked the conference host as part of the request.
		mIsConferenceHost = false;
		}

		ImsCall.Listener listener;

		synchronized(ImsCall.this) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -1948,7 +1948,7 @@ public class ImsManager implements IFeatureConnector {
		call.setListener(listener);
		ImsCallSession session = createCallSession(profile);

		if ((callees != null) && (callees.length == 1)) {
		if ((callees != null) && (callees.length == 1) && !(session.isMultiparty())) {
		call.start(session, callees[0]);
		} else {
		call.start(session, callees);